Merge branch 'ryerson-history' into 2.5.x-saas

Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml

airtime_mvc/application/views/scripts/menu.phtml

@@ -7,13 +7,18 @@
         		<span class="down"><?php echo _($page->getLabel()); ?></span>
 		    </a>
 		    <ul class="sub">
+
 			    <?php foreach ($page->getPages() as $sub) :
 			             if($sub->getId() == "manage_folder"){
 			                 continue;
 			             } ?>
+
+			    <?php if($this->navigation()->accept($sub)) : ?>
+
 			    <li>
 				    <a href="<?php echo $sub->getHref(); ?>" <?php echo ($sub->getTarget() != "")?"target=\"".$sub->getTarget()."\"":""; ?>><?php echo _($sub->getLabel()); ?></a>
 			    </li>
+			    <?php endif; ?>
 			    <?php endforeach; ?>
 		    </ul>
 		    <?php else: ?>