allows no-overlapping time periods for objects or group rules
better doc and error message
fixed case of source type in message
up ChangeLog
missing ";"

Conflicts:
	main/mailfilter/stubs/amavisd.conf.mas
added pyzor dependency
cherry-pickL removed idle ebox.spamd, this has fixed the file ownership prolbems with pyzor and razor2

Conflicts:
	main/mailfilter/src/EBox/MailFilter/SpamAssassin.pm
	main/mailfilter/stubs/local.cf.mas
updated changelog. Remove remains of spamd daemon
reformat
migration to get rid of ebox.spamd instances
added spf dependency, enable dkim
remove superfluous laod plugin dkim
Removing some classes that fail and commenting others to have at least the ones working
Recovered the NetWrappers.t test file
Making Gettext only run under demand because it needs a zentyal package to be installed in the system
Recovering deleted files and commenting or skipping tests
Improve CODE reference detection on types editable property
 Raise exception if during the provision either the domain  administrator user or the domain administrator group are  incorrectly mapped
ignore add/remove member when updating zentya groups, some more exceptions for addToZentyal and updateZentyal methods
Capture exceptions are now compatible with http proxy  transparent mode. Capture exceptions are applied to input to the server itself