Fix: no result with a number with a comma
Fix: Uniformize pdf code for typhon. This should also solve problem
of overlapped text into delivery receipts.

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
Fix: no result with a number with a comma

Conflicts:
	htdocs/fourn/facture/index.php

Change-Id: I6c67e3d2936673ea0993adfa1597bd11caf125fe
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
Fix bug FactureLine update for PgSQL
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/41317-impossible-de-modifier-une-ligne-de-facture#41422
Fixed bug #828: Error when code_region is not a number in llx_c_regions (with postgres)
fix : undefined variable
Merge pull request #843 from marcosgdf/bug-828

Fixed bug #828: Error when code_region is not a number in llx_c_regions ...
Improved dictionary translations + minor bug fix
Added missing translations
Missing externalsite module translations
Improved es_ES translations
Merge pull request #844 from grandoc/3.3

fix : undefined variable
Merge pull request #845 from marcosgdf/translations

Translations + minor bug fix
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
required once instead of require
Merge pull request #853 from FHenry/3.3

3.3
Merge remote-tracking branch 'origin/3.3' into develop

Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/langs/fr_FR/holiday.lang