Subscription to ML can also be done according to member type
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/admin.lib.php