diff --git a/lib/classes/base.class.php b/lib/classes/base.class.php
index c6e67a954f..73efe5842f 100644
--- a/lib/classes/base.class.php
+++ b/lib/classes/base.class.php
@@ -351,7 +351,7 @@ abstract class base
 //					{
 //						$alter[] = "ALTER TABLE `".$table['name']."` DROP `$f_name`";
 //					}
-					}
+        }
 
         foreach ($correct_table['fields'] as $f_name => $expr)
         {
@@ -515,20 +515,25 @@ abstract class base
           continue;
         }
 
-        $list_patches[$patch->get_release()][] = $patch;
+        $n = 0;
+        do
+        {
+          $key = $patch->get_release() . '.' . $n;
+          $n++;
+        }
+        while (isset($list_patches[$key]));
+
+        $list_patches[$key] = $patch;
       }
     }
     ksort($list_patches);
 
     $success = true;
 
-    foreach ($list_patches as $v => $patches)
+    foreach ($list_patches as $patch)
     {
-      foreach ($patches as $patch)
-      {
-        if (!$patch->apply($this->id))
-          $success = false;
-      }
+      if (!$patch->apply($this->id))
+        $success = false;
     }
 
     return $success;
diff --git a/lib/classes/task/archive.class.php b/lib/classes/task/archive.class.php
index c13bebda2b..c7776da3ac 100644
--- a/lib/classes/task/archive.class.php
+++ b/lib/classes/task/archive.class.php
@@ -618,7 +618,8 @@ class task_archive extends phraseatask
 
 	function isIgnoredFile($f)
 	{
-		return($f=='.' || $f=='..' || $f=='Thumbs.db' || $f=='par-SYSTEM' || substr($f, 0, 10)=='.com.apple');
+		$f =  strtolower($f);
+		return(($f[0]=='.' &&  $f != '.phrasea.xml' && $f != '.grouping.xml') || $f=='thumbs.db' || $f=='par-system');
 		// return(substr($f,0,1)=='.' || $f=='Thumbs.db' || $f=='par-SYSTEM');
 	}
 
diff --git a/lib/version.inc b/lib/version.inc
index fdfeb7b1f9..a719fdd1dd 100644
--- a/lib/version.inc
+++ b/lib/version.inc
@@ -1,2 +1,2 @@
 <?php
-define('GV_version','3.1.22');
+define('GV_version','3.1.23');
diff --git a/templates/web/login/index_layout_displaycooliris.twig b/templates/web/login/index_layout_displaycooliris.twig
index efffad3036..16a473c351 100644
--- a/templates/web/login/index_layout_displaycooliris.twig
+++ b/templates/web/login/index_layout_displaycooliris.twig
@@ -53,10 +53,10 @@
 	    <param name="allowFullScreen" value="true" />
 	    <param name="allowScriptAccess" value="always" />
 	    <param name="flashvars" 
-	      value="feed=/atom/cooliris/&glowColor=#0077BC&style=dark&backgroundColor=#000000&showChrome=false&showEMbed=false&showSearch=false" />
+	      value="feed=/atom/cooliris/&glowColor=#0077BC&showReflections=false&showEmbed=false&showSearch=false&style=dark&backgroundColor=#000000&showChrome=false&showItemEmbed=false&showSearch=false" />
 	    <embed wmode="transparent" type="application/x-shockwave-flash"
 	      src="http://apps.cooliris.com/embed/cooliris.swf"
-	      flashvars="feed=/atom/cooliris/&glowColor=#0077BC&style=dark&backgroundColor=#000000&showChrome=false&showEMbed=false&showSearch=false"
+	      flashvars="feed=/atom/cooliris/&glowColor=#0077BC&showReflections=false&showEmbed=false&showSearch=false&style=dark&backgroundColor=#000000&showChrome=false&showItemEmbed=false&showSearch=false"
 	      width="930" 
 	      height="360" 
 	      allowFullScreen="true"
diff --git a/www/admin/taskfacility.php b/www/admin/taskfacility.php
index c4d7fdb916..1517a32b5d 100644
--- a/www/admin/taskfacility.php
+++ b/www/admin/taskfacility.php
@@ -1,13 +1,11 @@
 <?php
-$r = dirname(dirname(dirname( __FILE__ )));
-
-require_once $r . "/lib/bootstrap.php";
+require_once dirname( __FILE__ ) . "/../../lib/bootstrap.php";
 
 $request = httpRequest::getInstance();
 $parm = $request->get_parms(
 					'cls'
 					 );
-
+					 
 $conn = connection::getInstance();
 if(!$conn)
 {
@@ -15,9 +13,9 @@ if(!$conn)
 }
 
 $cls = 'task_' . $parm['cls'];
-$tskfile = $r . '/lib/classes/task/' . $parm['cls'] . '.class.php';
 
-require_once $tskfile;
+// $tskfile = $r . '/lib/classes/task/' . $parm['cls'] . '.class.php';
+// require_once $tskfile;
 
 $ztask = new $cls();
 
diff --git a/www/login/index.php b/www/login/index.php
index 55cda94c81..9e6e53fe5c 100644
--- a/www/login/index.php
+++ b/www/login/index.php
@@ -119,6 +119,7 @@ $twig->display('login/index.twig', array(
 				'module'			=> $parm['app'],
 				'logged_out'			=> $parm['logged_out'],
 				'captcha_system'	=> $captchaSys,
+				'homelink'				=> new homelink(),
 				'login'				=> new login(),
 				'sso'				=> new sso(),
 				'display_layout'	=> GV_home_publi