Merge branch 'CC-3174' into devel

Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/airtime/library/spl.js

airtime_mvc/application/configs/ACL.php

@@ -24,6 +24,7 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
       ->add(new Zend_Acl_Resource('dashboard'))
       ->add(new Zend_Acl_Resource('preference'))
       ->add(new Zend_Acl_Resource('recorder'))
+      ->add(new Zend_Acl_Resource('showbuilder'))
       ->add(new Zend_Acl_Resource('auth'));
 
 /** Creating permissions */
@@ -42,6 +43,7 @@ $ccAcl->allow('G', 'index')
       ->allow('H', 'library')
       ->allow('H', 'search')
 	  ->allow('H', 'playlist')
+	  ->allow('H', 'showbuilder')
 	  ->allow('A', 'user')
 	  ->allow('A', 'systemstatus')
       ->allow('A', 'preference');

airtime_mvc/application/configs/navigation.php

@@ -29,6 +29,13 @@ $pages = array(
 		'action'     => 'index',
 		'resource'	=>	'library'
 	),
+	array(
+        'label'      => 'Airtimeline',
+        'module'     => 'default',
+        'controller' => 'Showbuilder',
+        'action'     => 'index',
+        'resource'  =>  'showbuilder'
+    ),
 	array(
 		'label'      => 'Calendar',
         'module'     => 'default',
@@ -67,7 +74,7 @@ $pages = array(
                 'action'     => 'stream-setting'
             ),
             array(
-                'label'      => 
+                'label'      =>
                 Application_Model_Preference::GetPlanLevel() == 'disabled'?'Support Settings':'Station Information Settings',
                 'module'     => 'default',
                 'controller' => 'Preference',