Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
is Spain
Merge pull request #576 from simnandez/3.3

 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
Merge pull request #578 from marcosgdf/translations

Translations!
Fix: Lost button

Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/facture/fiche.php
Fix: Syntax error with pgsql
Merge branch '3.3' of git://github.com/Dolibarr/dolibarr.git into 3.3
Fix: bad setup entry page
Fix: [ bug #622 ] attaching wrong file when sending the invoice via
e-mail
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
Updated change log
Merge pull request #580 from marcosgdf/3.3

Updated change log
Look: Minor fix in themes
Fix: Error using static method
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
Fix: Missing picto
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Fix: Bad selection of option
There is no need to warn the user as the picto already does