Add configuration file for openchange module
Add dovecot openchange plugin dependency
Load dovecot openchange plugin if openchange enabled
Write ocnotification service configuration and manage daemon
Write broker configuration for mapiproxy server
Merge branch 'master' into scabrero/oc-notifications-for-master

Conflicts:
	main/mail/ChangeLog
	main/openchange/ChangeLog
	main/openchange/debian/control
	main/openchange/src/EBox/OpenChange.pm
	main/samba/ChangeLog
	main/samba/stubs/openchange.conf.mas
Merge branch 'master' into scabrero/oc-notifications-for-master

Conflicts:
	main/mail/ChangeLog
	main/openchange/ChangeLog
	main/samba/ChangeLog
Enable automatic updates on commercial servers by default
Merge pull request #1606 from Zentyal/ejhernandez/fixes-on-qa

Enable automatic updates on commercial servers by default
Fix unit tests for dovecot template
Fixed wizard css glitch
Merge pull request #1607 from Zentyal/mjulian/wizard-css-glitch

Fixed wizard css glitch
remove workaround now that new API is on production
Merge branch 'scabrero/oc-notifications-for-master'

Conflicts:
	main/openchange/ChangeLog
	main/samba/ChangeLog
added necessary dependency for notifications
Fix realUsers count to remove Administrator and Guest account from it
Merge branch 'jjgarcia/fix-real-users-count' into ejhernandez/re-enable-user-sync

Conflicts:
	main/samba/ChangeLog