diff --git a/build/debian/get-orig-source.sh b/build/debian/get-orig-source.sh
index bf0b5063e0c..57f87ab1999 100755
--- a/build/debian/get-orig-source.sh
+++ b/build/debian/get-orig-source.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-# run with
-# debian/get-orig-source.sh [x.y.z]
+# Scan for new official sources and download file
+# run with debian/get-orig-source.sh [x.y.z]
 
 tmpdir=$(mktemp -d)
 echo "tmpdir = $tmpdir"
@@ -13,28 +13,11 @@ uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_
 cd $tmpdir
 
 tgzfile=$(echo *.tgz)
-version=$(echo "$tgzfile" | perl -pi -e 's/^dolibarr_//; s/\.zip$//; s/_/./g; s/\+nmu1//; ')
-
-# Extract the zip file
-tar -xvf $tgzfile
-srcdir=$(find . -maxdepth 1 -mindepth 1 -type d | sed -e 's/\.\///')
-
-if [ ! -d "$srcdir" ]; then
-    echo "ERROR: Failed to identify the extracted directory in $tmpdir (got $srcdir)" >&2
-    rm -rf $tmpdir
-    exit 1
-fi
-
-# Repack as tar.xz
-tar Jcf dolibarr_${version}.orig.tar.xz $srcdir
+version=$(echo "$tgzfile" | perl -pi -e 's/^dolibarr-//; s/\.tgz$//; s/_/./g; s/\+nmu1//; ')
 
 cd - >/dev/null
 
-if [ -e ../dolibarr_${version}.orig.tar.xz ]; then
-    echo "Not overwriting ../dolibarr_${version}.orig.tar.xz";
-else
-    echo "Created ../dolibarr_${version}.orig.tar.xz"
-    mv $tmpdir/dolibarr_${version}.orig.tar.xz ../
-fi
+mv $tmpdir/dolibarr-${version}.tgz ../
+echo "File ../dolibarr-${version}.tgz is ready for git-import"
 
-#rm -rf $tmpdir
+rm -rf $tmpdir
diff --git a/build/tgz/tar_exclude.txt b/build/tgz/tar_exclude.txt
index 8cbde2f1903..3f3ff2e27fb 100644
--- a/build/tgz/tar_exclude.txt
+++ b/build/tgz/tar_exclude.txt
@@ -37,8 +37,6 @@ htdocs/customleave
 htdocs/customgoogle
 htdocs/document
 htdocs/documents
-htdocs/includes/ckeditor/_source
-htdocs/includes/ckeditor/*_source.js
 htdocs/includes/fckeditor/_samples
 htdocs/includes/fckeditor/_testcases
 htdocs/includes/nusoap/samples
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b509c41666a..7b21c9ca20c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3478,16 +3478,18 @@ function dol_html_entity_decode($a,$b,$c='UTF-8')
 
 /**
  * Replace htmlentities functions to manage errors
+ * http://php.net/manual/en/function.htmlentities.php
  *
- * @param   string	$a		Operand a
- * @param   string	$b		Operand b
- * @param   string	$c		Operand c
- * @return  string      	String encoded
+ * @param   string  $string         The input string.
+ * @param   int     $flags          Flags(see PHP doc above)
+ * @param   string  $encoding       Encoding
+ * @param   bool    $double_encode  When double_encode is turned off PHP will not encode existing html entities
+ * @return  string  $ret            Encoded string
  */
-function dol_htmlentities($a,$b,$c='UTF-8')
+function dol_htmlentities($string, $flags=null, $encoding='UTF-8', $double_encode=false)
 {
 	// We use @ to avoid warning on PHP4 that does not support entity decoding to UTF8;
-	$ret=@htmlentities($a,$b,$c);
+	$ret=@htmlentities($string, $flags, $encoding, $double_encode);
 	return $ret;
 }
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index bd1fae497f2..dd9ab8f1abf 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1665,6 +1665,41 @@ class Societe extends CommonObject
         return $contacts;
     }
 
+    /**
+     *    Renvoie la liste des contacts de cette societe
+     *
+     *    @return    array    $contacts    tableau des contacts
+     */
+    function contact_array_objects()
+    {
+        require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+        $contacts = array();
+
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = '".$this->id."'";
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $nump = $this->db->num_rows($resql);
+            if ($nump)
+            {
+                $i = 0;
+                while ($i < $nump)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $contact = new Contact($this->db);
+                    $contact->fetch($obj->rowid);
+                    $contacts[] = $contact;
+                    $i++;
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+        return $contacts;
+    }
+
     /**
      *  Return property of contact from its id
      *