Merge branch 'cc-4661-listener-statistics' into devel

Conflicts:
	python_apps/api_clients/api_client.py

airtime_mvc/application/configs/ACL.php

@@ -23,6 +23,7 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
       ->add(new Zend_Acl_Resource('preference'))
       ->add(new Zend_Acl_Resource('showbuilder'))
       ->add(new Zend_Acl_Resource('playouthistory'))
+      ->add(new Zend_Acl_Resource('listenerstat'))
       ->add(new Zend_Acl_Resource('usersettings'))
       ->add(new Zend_Acl_Resource('audiopreview'))
       ->add(new Zend_Acl_Resource('webstream'));
@@ -43,6 +44,7 @@ $ccAcl->allow('G', 'index')
       ->allow('H', 'library')
       ->allow('H', 'playlist')
       ->allow('A', 'playouthistory')
+      ->allow('A', 'listenerstat')
       ->allow('A', 'user')
       ->allow('A', 'systemstatus')
       ->allow('A', 'preference');

airtime_mvc/application/configs/classmap-airtime-conf.php

@@ -183,4 +183,18 @@ return array (
   'BaseCcWebstreamMetadataPeer' => 'airtime/om/BaseCcWebstreamMetadataPeer.php',
   'BaseCcWebstreamMetadata' => 'airtime/om/BaseCcWebstreamMetadata.php',
   'BaseCcWebstreamMetadataQuery' => 'airtime/om/BaseCcWebstreamMetadataQuery.php',
+  'CcTimestampTableMap' => 'airtime/map/CcTimestampTableMap.php',
+  'CcTimestampPeer' => 'airtime/CcTimestampPeer.php',
+  'CcTimestamp' => 'airtime/CcTimestamp.php',
+  'CcTimestampQuery' => 'airtime/CcTimestampQuery.php',
+  'BaseCcTimestampPeer' => 'airtime/om/BaseCcTimestampPeer.php',
+  'BaseCcTimestamp' => 'airtime/om/BaseCcTimestamp.php',
+  'BaseCcTimestampQuery' => 'airtime/om/BaseCcTimestampQuery.php',
+  'CcListenerCountTableMap' => 'airtime/map/CcListenerCountTableMap.php',
+  'CcListenerCountPeer' => 'airtime/CcListenerCountPeer.php',
+  'CcListenerCount' => 'airtime/CcListenerCount.php',
+  'CcListenerCountQuery' => 'airtime/CcListenerCountQuery.php',
+  'BaseCcListenerCountPeer' => 'airtime/om/BaseCcListenerCountPeer.php',
+  'BaseCcListenerCount' => 'airtime/om/BaseCcListenerCount.php',
+  'BaseCcListenerCountQuery' => 'airtime/om/BaseCcListenerCountQuery.php',
 );

airtime_mvc/application/configs/navigation.php

@@ -85,6 +85,13 @@ $pages = array(
                 'controller' => 'playouthistory',
                 'action'     => 'index',
                 'resource'   => 'playouthistory'
+            ),
+            array(
+                'label'      => 'Listener Stats',
+                'module'     => 'default',
+                'controller' => 'listenerstat',
+                'action'     => 'index',
+                'resource'   => 'listenerstat'
             )
         )
     ),