Merge branch 'master' into develop

app/Config/routes.php

@@ -43,7 +43,7 @@
 	CakePlugin::routes();
 
 /**
- * Load the CakePHP default routes. Remove this if you do not want to use
+ * Load the CakePHP default routes. Only remove this if you do not want to use
  * the built-in default routes.
  */
 	require CAKE . 'Config' . DS . 'routes.php';

app/Controller/AttributesController.php

@@ -677,8 +677,8 @@ class AttributesController extends AppController {
 				}
 			}
 
-			arsort($relatedEventsDates);
 			if (isset($relatedEventsDates)) {
+				arsort($relatedEventsDates);
 				$relatedEventsDates = array_unique($relatedEventsDates);
 				foreach ($relatedEventsDates as $key => $relatedEventsDate) {
 					$relatedEvents[] = array('id' => $key, 'date' => $relatedEventsDate);

app/View/Layouts/default.ctp

@@ -35,7 +35,7 @@
 		echo $this->fetch('css');
 		echo $this->fetch('script');
 
-		echo $this->Html->script('jquery-1.7.2.min'); // Include jQuery library
+		echo $this->Html->script('jquery-1.8.2.min'); // Include jQuery library
 	?>
 
 <!--?php echo $scripts_for_layout; ?-->