Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --combined myslice/settings.py
index b36281b,262ad06..0e0bf37
--- 1/myslice/settings.py
--- 2/myslice/settings.py
+++ b/myslice/settings.py
@@@ -90,9 -90,6 +90,9 @@@ MANAGERS = ADMIN
  #DEFAULT_FROM_EMAIL = "root@theseus.ipv6.lip6.fr"
  #EMAIL_HOST_PASSWORD = "mypassword"
  
 +if config.myslice.default_sender:
 +    DEFAULT_FROM_EMAIL = config.myslice.default_sender
 +
  EMAIL_HOST = "localhost"
  EMAIL_PORT = 25
  EMAIL_USE_TLS = False
@@@ -365,7 -362,7 +365,7 @@@ CSRF_FAILURE_VIEW = 'manifoldapi.manifo
  
  ####SLA#####
  
- SLA_COLLECTOR_URL = "http://157.193.215.125:4001/sla-collector/sla"
+ SLA_COLLECTOR_URL = "https://157.193.215.125:4001/sla-collector/sla"
  SLA_COLLECTOR_USER = "portal"
  SLA_COLLECTOR_PASSWORD = "password"