Merge pull request #838 from FHenry/develop

Fix [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
Merge pull request #839 from FHenry/3.3

Fix [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
[ task #741 ] Gestion des interventions/Add intervention box
Qual: No need to use two menu entries for this.
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Update soap setup
Merge pull request #840 from FHenry/develop

[ task #741 ] Gestion des interventions/Add intervention box
Fix: Spelling es_ES boxes lang
Trad: Add ca_ES missing translations
Fix: Bad translation
fix [ bug #825 ] User first name not visible into users->perms
Merge remote-tracking branch 'origin/3.3' into develop

Conflicts:
	ChangeLog
	htdocs/admin/dict.php
	htdocs/comm/prospect/fiche.php
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Merge remote-tracking branch 'origin/3.3' into develop
[ task #826 ] Increasing stock when deleting an invoice
Fix : set emetteur to MYCOMPANY when payment is a customer
Fix : action list couldn't be sorted by label, action type was kept in filter
Fix: duplicate sql request
Fix: missing field
Print forgotten
Merge pull request #842 from atm-maxime/develop

2 minor fixes