Fix: [ bug #520 ] Product statistics and detailed lists are wrong
Fix: Compatibility with v4 of ckeditor (for debian)
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
Script to prepare 3.3.5
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	build/makepack-dolibarr.pl
Update list.php

to save the town filtre on prospect list, just i replace: 
$param='&amp;stcomm='.$stcomm.'&amp;search_nom='.urlencode($search_nom).'&amp;search_zipcode='.urlencode($search_zipcode).'&amp;search_ville ='.urlencode($search_ville );

search_ville by search_town
Merge pull request #1468 from bouna/patch-1

Update list.php
Fix: import of fields with value "auto"
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
Fix: Agenda and Banks module were not working with multicompany module
Removed duplicate line
Even better improvement
Merge pull request #1504 from marcosgdf/multicompany-fixes

Fix: Agenda and Banks module were not working with multicompany module
Fixed a problem with bank accounts sharing across entities
Merge pull request #1516 from marcosgdf/multicompany-fixes

Fixed a problem with bank accounts sharing across entities
FIX : [ bug #1317 ] Removing a category does not remove all child categories
FIX : [ bug #1317 ] Removing a category does not remove all child
categories
Fix phpunit to be compatible with new version of phpunit
Fix: [ bug #1380 ] Customer invoices are not grouped in company results
report
(cherry picked from commit bd061f4)
Merge pull request #1636 from marcosgdf/cp-1380

Fix: [ bug #1380 ] Customer invoices are not grouped in company results report (cherry picked from commit bd061f4)