Fix: A better fix for escaping data: escape for database must be done
during sql request forging. Also renamed tag to tag.

Merge:
Security fix emailing read and
unsubscribe

unsubscribe can lead to email disclosure

Conflicts:
	htdocs/public/emailing/mailing-unsubscribe.php
Added missing translations
Reverted removal of strings in PR #570
Added missing strings to en_US
Added missing es_ES translation & fixed typo
Fix: Modify Spanish localtax2 to new rate
Merge branch '3.3' of git://github.com/Dolibarr/dolibarr.git into 3.3
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
is Spain
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
is Spain
Merge pull request #573 from marcosgdf/translations

Added missing translations
Merge pull request #574 from simnandez/3.3

Fix: Modify Spanish localtax2 to new rate
Fix: font size