Fix indentation
Fix popup width
Redirect https traffic to the captive port
Allow login when accessing an HTTPS page
Remove debug code
Added missing use statement in EBox::Types::MultiStateAction
Merge pull request #632 from Zentyal/rduran/captiveportal-https-login

Rduran/captiveportal https login
Merge pull request #633 from Zentyal/jag/core-multistateaction-missing-use

Added missing use statement in EBox::Types::MultiStateAction
Fixed regression in Update list button in Components page
Merge branch 'master' into jacalvo/3.2-final-changes

Conflicts:
	main/core/ChangeLog