backup for subscription, backup for no subscription pending
Merge branch 'jag/new-remote-services' of github.com:Zentyal/zentyal into new-remote-services

Conflicts:
	main/core/www/js/remoteservices.js