diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index e0fa89d924d..2802e55c702 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -571,6 +571,7 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mobiledetect/mobiledetectlib/.gitmodules`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/parsedown/LICENSE.txt`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/.gitattributes`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/license.md`;
@@ -579,6 +580,7 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Examples`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/unitTests`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.md`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/LICENSE`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/ae_fonts_*`;
@@ -590,6 +592,8 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
+        
         
         print "Remove subdir of custom dir\n";
    	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\;\n";
diff --git a/htdocs/includes/stripe/build.php b/htdocs/includes/stripe/build.php
old mode 100644
new mode 100755
diff --git a/htdocs/modulebuilder/template/.gitattributes b/htdocs/modulebuilder/template/.gitattributes
index 58065c729fc..0d2c67e38e6 100644
--- a/htdocs/modulebuilder/template/.gitattributes
+++ b/htdocs/modulebuilder/template/.gitattributes
@@ -13,7 +13,7 @@
 *.lang text eol=lf
 *.txt text eol=lf
 *.md text eol=lf
-*.bat text eol=crlf
+*.bat text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
 *.ico binary
diff --git a/htdocs/modulebuilder/template/dev/dolistore/README.md b/htdocs/modulebuilder/template/dev/dolistore/README.md
deleted file mode 100644
index d322d2c98fe..00000000000
--- a/htdocs/modulebuilder/template/dev/dolistore/README.md
+++ /dev/null
@@ -1,87 +0,0 @@
-Dolistore
-=========
-
-[Dolistore](https://dolistore.com) is the marketplace for Dolibarr modules.
-
-This directory contains templates assets that may be useful for publication.
-
-Images
-------
-
-### Logo
-
-See [img folder README](../img/README.md).
-
-### Screenshots
-
-Texts
------
-
-All texts needs 5 languages versions for:
-- en (English)
-- fr (Français)
-- es (Español)
-- it (Italiano)
-- de (Deutsch)
-
-### Name
-
-The module's marketed name.
-
-### Price
-
-Expressed in Euro (€).  
-Keep in mind that Dolistore will keep a 20% markup.
-
-### Categories
-
-- [x] Modules/Plugins
-- [ ] Skins and Templates
-- [ ] Tools and documentation
-- [ ] Skins
-- [ ] Document templates
-- [ ] System tools
-- [ ] CRM
-- [ ] ECM
-- [ ] Human Relationship
-- [ ] Products, Services or Stock
-- [ ] Project or collaborative
-- [ ] Interfaces
-- [ ] Other
-- [ ] Reporting or search
-- [ ] User's interface
-- [ ] 2Report sub-modules
-- [ ] Accountancy
-
-*The list may change. Check [Dolistore](https://dolistore.com) for up-to-date information.*
-
-### Short description
-
-A short description of the modules main features.  
-400 characters max.
-
-### Keywords
-
-Comma separated lists.
-eg: ```template,dev,module```
-
-### Long description
-
-The long description of your module.
-
-Suggested technical data:
-
-Version: 1.0.0  
-Publisher: MyCompany  
-Licence: GPLv3+  
-User interface language(s): English  
-Help/Support: None / Forum www.dolibarr.org / Mail at contact@example.com  
-Prerequisites:
-- Dolibarr min version: 3.8
-- Dolibarr max version: 3.9.*
-- PHP: ≥5.3  
-Install:
-- Download the module's archive file (.zip file) from DoliStore.com.
-- Put the file into the custom directory of Dolibarr.
-- Uncompress the zip file, for example with ```unzip modulefile_version.zip``` command.
-- Module is then available and can be activated.  
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-de.txt b/htdocs/modulebuilder/template/dev/dolistore/name-de.txt
deleted file mode 100644
index d177fbf2ba9..00000000000
--- a/htdocs/modulebuilder/template/dev/dolistore/name-de.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mein modul
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-en.txt b/htdocs/modulebuilder/template/dev/dolistore/name-en.txt
deleted file mode 100644
index bf608d557d4..00000000000
--- a/htdocs/modulebuilder/template/dev/dolistore/name-en.txt
+++ /dev/null
@@ -1 +0,0 @@
-My module
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-es.txt b/htdocs/modulebuilder/template/dev/dolistore/name-es.txt
deleted file mode 100644
index a0ec54ad842..00000000000
--- a/htdocs/modulebuilder/template/dev/dolistore/name-es.txt
+++ /dev/null
@@ -1 +0,0 @@
-My módulo
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-fr.txt b/htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
deleted file mode 100644
index 310ebcf10a5..00000000000
--- a/htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mon module
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-it.txt b/htdocs/modulebuilder/template/dev/dolistore/name-it.txt
deleted file mode 100644
index a196c1511a1..00000000000
--- a/htdocs/modulebuilder/template/dev/dolistore/name-it.txt
+++ /dev/null
@@ -1 +0,0 @@
-Il mio modulo
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/git-hooks/post-commit b/htdocs/modulebuilder/template/dev/git-hooks/post-commit
old mode 100644
new mode 100755
diff --git a/htdocs/modulebuilder/template/dev/git-hooks/pre-commit b/htdocs/modulebuilder/template/dev/git-hooks/pre-commit
old mode 100644
new mode 100755
diff --git a/htdocs/modulebuilder/template/dev/git-hooks/pre-push b/htdocs/modulebuilder/template/dev/git-hooks/pre-push
old mode 100644
new mode 100755
diff --git a/htdocs/modulebuilder/template/dev/newmodule.sh b/htdocs/modulebuilder/template/dev/newmodule.sh
deleted file mode 100644
index 92f4875cbf6..00000000000
--- a/htdocs/modulebuilder/template/dev/newmodule.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2014 Raphaël Doursenaud
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-VERSION=0.0.1
-USAGE="Usage: newmodule.sh NewName"
-
-# TODO: check depedencies presence (find, sed and rename)
-# TODO: allow execution from build directory
-# TODO: validate parameter
-# TODO: use multiple word parameter, for example "My module is awesome" which should lead to "MyModuleIsAwesome" and "mymoduleisawesome" so we can also fix language strings
-# TODO: add module ID management (language files…)
-# TODO: add oneliner description management
-# TODO: add copyright management
-
-if [ $# == 0 ] ; then
-    echo ${USAGE}
-    exit 1;
-fi
-
-ToLower () {
-	echo $(echo $1 | tr '[:upper:]' '[:lower:]')
-}
-ToUpper () {
-	echo $(echo $1 | tr '[:lower:]' '[:upper:]')
-}
-
-CAMELORIG="MyModule"
-LOWERORIG=$(ToLower ${CAMELORIG})
-UPPERORIG=$(ToUpper ${CAMELORIG})
-cameltarget=$(echo $1)
-lowertarget=$(ToLower $1)
-uppertarget=$(ToUpper $1)
-thisscript=`basename $0`
-
-# Rewrite occurences
-find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${CAMELORIG}/${cameltarget}/g"
-find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${LOWERORIG}/${lowertarget}/g"
-find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${UPPERORIG}/${uppertarget}/g"
-
-# Rename files
-for file in $(find . -not -iwholename '*.git*' -name "*${CAMELORIG}*" -type f)
-do
-	rename ${CAMELORIG} ${cameltarget} ${file}
-done
-for file in $(find . -not -iwholename '*.git*' -name "*${LOWERORIG}*" -type f)
-do
-	rename ${LOWERORIG} ${lowertarget} ${file}
-done
-for file in $(find . -not -iwholename '*.git*' -name "*${UPPERORIG}*" -type f)
-do
-	rename ${UPPERORIG} ${uppertarget} ${file}
-done
-
-# TODO: add instructions about renaming vars (ack --php -i my)
-# TODO: add instructions about renaming files (ls -R|grep -i my)
diff --git a/htdocs/modulebuilder/template/scripts/myobject.php b/htdocs/modulebuilder/template/scripts/myobject.php
old mode 100644
new mode 100755