Fix: sql error on numbering module for tasks
Merge remote-tracking branch 'origin/3.5' into develop

Conflicts:
	htdocs/comm/action/fiche.php
Fix: Bad picto for project setup page
Fix: dead code
Fix: Update translation guide
Fix: Translation done twice
Update llx_00_c_pays.sql

adding burundi in pays database
Merge pull request #1443 from defrance69/patch-33

Update llx_00_c_pays.sql
Merge branch 'bug-1123' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1123

Conflicts:
	ChangeLog
Merge pull request #1442 from aspangaro/develop

Problem of presentation when skype module is enabled
Merge branch 'project-translations' of
https://github.com/marcosgdf/dolibarr into
marcosgdf-project-translations

Conflicts:
	ChangeLog
Merge pull request #1441 from syrus34/patch-3

Update commondocgenerator.class.php
Fix: [ bug #1206 ] PMP price is bad calculated
Qual: Removed dead code
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Fix: Invalid image link
Fix: [ bug #1206 ] PMP price is bad calculated
Fix: [ bug #520 ] Product statistics and detailed lists are wrong
Merge remote-tracking branch 'origin/3.4' into 3.5
Fix: [ bug #1240 ] traduction