Merge branch 'Merge_gabriel_mayo' of https://git.ccom.uprrp.edu/CDCC/OLAS into Merge_gabriel_mayo

.gitignore

@@ -12,7 +12,8 @@ app/config/testing/*
 app/config/database.php
 app/config/app.php
 app/config/*
-
+app/storage/annual_pdfs/*
+public/exports/*
 
 node_modules/
 vendor/*

app/controllers/Objective2Controller.php

@@ -656,4 +656,4 @@ class Objective2Controller extends \BaseController
 	{
 		//
 	}
-}
+}

app/controllers/TemplatesController.php

@@ -248,7 +248,7 @@ class TemplatesController extends \BaseController
 			// 			var_dump(json_encode($templates_dentro));
 // 		}
 
-
+	$templates_fuera=array();
 		return View::make('local.managers.shared.rubrics_new', compact('title', 'templates_dentro', 'templates_fuera', 'outcomes', 'criteria', 'schools', 'programs', 'criteria_ids'));
 	}
 

app/views/local/managers/shared/rubrics_new.blade.php

@@ -115,8 +115,10 @@
 
                             @endforeach
                         </select>
+<!-- 
 					<span style="color: red;">Rubrics with "##" at the beginning contain criteria that are not associated with your program or school. You will not be able to use them until your criteria is matched with your program or school.
                     </span>
+ -->
 					</div>
 
                     <!-- If user is admin s/he can pick which schools can view the rubric -->