Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
	htdocs/product/stats/facture.php

Fix  [ bug #1714 ] Id "sall" is used twice in different HTML tags

Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php

Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL

marcosgdf-bug-1757

Conflicts:
	ChangeLog

Conflicts:
	ChangeLog

Fix [ bug #1715 ] Valign and width attributes are used in div tags

Fix [ bug #575 ] GED doesn't works if there is "/" in a mask

Fix: [ bug #1674 ] PayPal logo copyright issues

Fix: [ bug #1724 ] Can't add a submenu to projects

Enhance select_salesrepresentatives with select2

 Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H

Fix [ bug #1723 ] Draft tasks?

Fixed string not translated in linked objects of a project

Fix: [ bug #1533 ] Links triggers do not show trigger error message

Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify

marcosgdf-bug-1731

Conflicts:
	ChangeLog

Translation error

Fixed [ bug #1763 ] Undefined variable $interface in Project:574