Fix: Bad name of function
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
Fix: _ not allowed into prestashop tags.
Fix: file with a specific mask not found
Fix: file with a specific mask not found, again
Generalize fix: file with a specific mask not found, again

Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/expedition/fiche.php
	htdocs/fichinter/fiche.php
Merge branch '3.3' into 3.3_extrafieldmore
Check style
(http://www.dolibarr.fr/forum/3-installation/40712-sauvegarde)
Fix Ducth (nl_NL) translation
Merge pull request #797 from FHenry/3.3

Check style
[ bug #790 ] Spanish localtax RE not being correctly calculated
Update Changelog
Fix[ bug #774 ] Bug on creating event with box "all day" crossed
Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page
mail
Fix [ bug #794 ] Lost filter on zipwode in prospect list
Merge pull request #801 from simnandez/3.3

Fix: [ bug #790 ] Spanish localtax RE not being correctly calculated
Merge pull request #803 from FHenry/3.3

Fix[ bug #774 ] Bug on creating event with box "all day" crossed
Merge pull request #807 from FHenry/3.3_bug794

Fix [ bug #794 ] Lost filter on zipwode in prospect list
Fixed translations and BILL_SUPPLIER_BUILDDOC trigger
Merge pull request #809 from marcosgdf/3.3

Improved translations and BILL_SUPPLIER_BUILDDOC trigger