debug planned_workload loosing value on error
Merge pull request #1444 from atm-alexis/3.5

debug planned_workload loosing value on error
bug on update service with service created in 3.4
Merge pull request #1453 from atm-alexis/3.5

bug on update service with service created in 3.4
Fix: Add a space after (int) for travis succes ;)
Fix: td balance.
Fix: New price was not used when editing a line when margin module was
on.
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
Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
	htdocs/main.inc.php
Merge remote-tracking branch 'origin/3.5' into develop

Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
	htdocs/product/class/product.class.php