Don't put duplicate bridge interfaces in smb.conf
 Better warnings for fixed addresses objects with same member  name or mac
removed innecesary guard
Remove unnecessary and problematic desktop services code
Merge pull request #538 from Zentyal/jag/samba-duplicate-bridges

Don't put duplicate bridge interfaces in smb.conf
Merge pull request #540 from Zentyal/jag/dhcp-better-control-fixed-addresses

 Better warnings for fixed addresses objects with same member  name or m...
Fixed typo in master.cf when mail fitler is enabled
Merge pull request #545 from Zentyal/jag/mail-conf-typo-fix

Fixed typo in master.cf when mail fitler is enabled
fixed typo in changelog
Merge pull request #541 from Zentyal/jacalvo/remove-desktopservices

Remove unnecessary and problematic desktop services code
Merge branch '3.0'

Conflicts:
	main/core/ChangeLog
	main/core/conf/core.conf
	main/core/debian/precise/control
	main/core/src/EBox/Desktop/ServiceProvider.pm
	main/core/src/EBox/DesktopServices/CGI/Index.pm
	main/core/src/EBox/DesktopServices/CGI/t/Index.t
	main/core/src/EBox/WebAdmin.pm
	main/core/src/cgi/desktop-services.cgi
	main/core/stubs/apache.mas
	main/dhcp/ChangeLog
	main/dhcp/src/EBox/DHCP/Model/FixedAddressTable.pm
	main/dns/ChangeLog
	main/dns/debian/precise/control
	main/mail/ChangeLog
	main/remoteservices/ChangeLog
	main/remoteservices/debian/precise/control
	main/remoteservices/src/EBox/RemoteServices.pm
	main/remoteservices/src/EBox/RemoteServices/Desktop/Subscription.pm
	main/samba/ChangeLog