Exclude conf.php file from git
Fix update extrafield do not display immediatly
Fix: [ bug #1033 ] SUPPLIER REF disappeared


Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7
Fix Bug with canvas
Fix canvas feature broken
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4

Conflicts:
	ChangeLog
Merge pull request #1177 from FHenry/3.4

Fix update extrafield do not display immediatly
fix some trad
Fix: [ bug #1037 ] Consumption> Supplier invoices related
fix old bug on reordering supplier products in list
Merge pull request #1185 from altatof/3.4

fix old bug on reordering supplier products in list
Fix UserGroup name not display in card view or edit
Merge remote-tracking branch 'origin/3.4' into 3.4

Conflicts:
	ChangeLog

Change-Id: I325ab3266300286664f4790b5f2314255ac1911d
Merge pull request #1186 from FHenry/3.4

Fix UserGroup name not display in card view or edit
Fix retrieving of margin info when invoice created automatically from order (used by workflow module)
Merge pull request #1187 from altatof/3.4

Fix retrieving of margin info when invoice created automatically from order.
Merge pull request #1181 from grandoc/3.3

fix some trad
Fix: B1032-develop: Problem in the filter of Contact by company category
fix display of buying price on line edit when no supplier price is defined