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

Conflicts:
	portal/templates/fed4fire/fed4fire_home-view.html

diff --cc portal/actions.py
index 482a746,482a746..aa156a5
--- 1/portal/actions.py
--- 2/portal/actions.py
+++ b/portal/actions.py
@@@ -61,8 -61,8 +61,8 @@@ def get_jfed_identity(request)
              private_key = account_config['user_private_key']
              user_hrn = account_config.get('user_hrn','N/A')
              platform_detail = get_myslice_platform(request)
--            #registry = get_registry_url(request)
--            registry = 'http://sfa-fed4fire.pl.sophia.inria.fr:12345/'
++            registry = get_registry_url(request)
++            #registry = 'http://sfa-fed4fire.pl.sophia.inria.fr:12345/'
              jfed_identity = user_hrn + '\n' + registry + '\n' + private_key 
              return jfed_identity
          else:

diff --cc portal/templates/fed4fire/fed4fire_home-view.html
Simple merge