Squashed commit of the following:

commit 8ed90b1efe3a0643f226b0ffa002b5e21252febf
Merge: 4c6da13 d3c54d4
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Thu Dec 12 11:59:09 2013 +0100

    Merge branch '3.0' into ejhernandez/offer-2013

    Conflicts:
    	main/core/ChangeLog
    	main/remoteservices/ChangeLog
    	main/squid/ChangeLog
    	main/users/ChangeLog

commit 4c6da1316ff482db6db3613e472e16f43e32775c
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Tue Dec 3 00:44:26 2013 +0100

    Doc aclaration

commit 6c6b52947f75e847d481f38bfbe34a0b3b953809
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Tue Dec 3 00:43:38 2013 +0100

    Remove useless warning when deleting a user or group with offer 2013

commit b753afa741f6293cfdc244c88fa79326fb265556
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Tue Dec 3 00:39:02 2013 +0100

    Make external AD auth available for offer 2013

commit ebf9a72108b84af5fbb2a3afd311871e2b497707
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Tue Dec 3 00:28:09 2013 +0100

    Remove style in zentyal package list when sb is set

    As it is not longer applied

commit 6fa666892262ca5820c5fc308b6f361aaa74fd41
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Tue Nov 26 23:26:36 2013 +0100

    Final fix in Subscription Info

commit c400c117bb25bff2cb5bddb88a365596eb945a8b
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Tue Nov 26 23:23:27 2013 +0100

    Integration changes to show the warning in the UI

commit ffd2664854da4513d1db1a14c8ec96c55cea9629
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Tue Nov 26 23:23:05 2013 +0100

    Change Technical Support names to match offer 2013

commit 6a5227e72e0552fa594448728a840018aad66e95
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Tue Nov 26 18:59:06 2013 +0100

    Update messages in info models

    Update support information due to offer 2013

commit f24bc2398bfe92ac7ca79a224e5f902306bf71ec
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Mon Nov 25 22:48:08 2013 +0100

    Show ad messages in SubscriptionInfo model

commit 6884e053864aac0a48760ae9088e5ff125f501f6
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Mon Nov 25 22:13:05 2013 +0100

    Remove useless code due to offer 2013

commit b58d9d22791cb9f7db2e55097b4ec5a53e809a2f
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Mon Nov 25 22:12:28 2013 +0100

    Remove restricted modules to get info

commit 4c411bdaaac4682a82f5ef62c6bde22b065a3e4c
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Mon Nov 25 22:05:06 2013 +0100

    Retrieve the maximum users from Zentyal Remote

commit 59c13b787d23374785c35d8c91498b8e8dcaff02
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Mon Nov 25 18:50:05 2013 +0100

    Added new i18n editions

commit ff3f444f6c003de8a07f87e600de391e9fd30e99
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Mon Nov 25 18:43:18 2013 +0100

    splay remote services messages if they exist on Dashboard

commit 98b694ef92930f6537507590b16d73564aef2fef
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Mon Nov 25 18:36:33 2013 +0100

    Not enforcing but warning max user restriction

    Store an ad message instead of enforcing max number of users
    in the registration check

commit 89b6b8358d3c8966d1f54e99d8cdbe990abcd4ec
Author: Enrique J. Hernández Blasco <ejhernandez@zentyal.com>
Date:   Mon Nov 25 18:34:15 2013 +0100

    Now the module has support to store ad messages

(cherry picked from commit 2a1dcfa6186003245865fce81b3cc66db3afbd0a)

Conflicts:
	main/core/ChangeLog
	main/remoteservices/src/EBox/RemoteServices/Subscription/Check.pm
	main/software/ChangeLog
	main/software/src/templates/ebox.mas
	main/squid/ChangeLog
	main/squid/src/EBox/Squid.pm
	main/users/ChangeLog
	main/users/src/EBox/Users.pm
Merge branch '3.2' into jacalvo/3.2-sp1

Conflicts:
	main/core/ChangeLog
	main/remoteservices/ChangeLog
	main/software/ChangeLog