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

Conflicts:
	portal/actions.py

diff --cc myslice/urls.py
Simple merge

diff --cc portal/actions.py
index 6955c62,399cae6..ca87543
--- 1/portal/actions.py
--- 2/portal/actions.py
+++ b/portal/actions.py
@@@ -705,7 -562,7 +705,6 @@@ def create_pending_user(wsgi_request, r
              .filter_by('platform', '==', 'myslice')           \
              .select('platform_id')
          reg_platform = execute_admin_query(wsgi_request, reg_platform_query)
-     
 -
          reg_platform_id = reg_platform[0]['platform_id']
          account_params = {
              'platform_id'   : reg_platform_id, # XXX ALERT !!

diff --cc ui/templates/base.html
Simple merge

diff --cc ui/templates/messages-transient-header.html
Simple merge