Merge branch 'master' of github.com:benadida/helios-server

settings.py.sample

@@ -109,6 +109,9 @@ LOGOUT_ON_CONFIRMATION = True
 # The two hosts are here so the main site can be over plain HTTP
 # while the voting URLs are served over SSL.
 URL_HOST = "http://localhost:8000"
+
+# IMPORTANT: you should not change this setting once you've created
+# elections, as your elections' cast_url will then be incorrect.
 SECURE_URL_HOST = "https://localhost:8443"
 
 # this additional host is used to iframe-isolate the social buttons,