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
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