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.
New: Update ckeditor to version 4 (part 1)
New: Update ckeditor to version 4 (part 2)
Fix css for ckeditor 4.
Fix: Readonly mode does not need to use a specific toolbar with ckeditor
4.
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
Enhance packager:
- No need to be root to run script
- create git tag of version
- debian package do not use the deprecated dpatch command
- debian package is a quilt package (not native)
- debian package was missing file watch
- clean exclusion for zip and tgz package (exclusion must be done into
makepack-dolibarr.pl, not into specific package code)
- can publish files to sourceforge
Script to prepare 3.3.5
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	build/makepack-dolibarr.pl
Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
	build/debian/dolibarr.install
	build/makepack-dolibarr.pl
Merge remote-tracking branch 'origin/3.5' into develop
Packager works with beta versions