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

Conflicts:
	portal/urls.py

diff --cc portal/urls.py
index a57c5fd,229974c..2887388
--- 1/portal/urls.py
--- 2/portal/urls.py
+++ b/portal/urls.py
@@@ -22,8 -22,7 +22,7 @@@
  
  from django.conf.urls import patterns, include, url
  from portal           import views
- from portal.views     import  DashboardView, PresViewView
- from portal.views     import DashboardView, PresViewView, PlatformsView, PlatformView
 -from portal.views     import DashboardView, PresViewView, PlatformsView, ValidatePendingView # UserRegisterView, UserValidateView
++from portal.views     import DashboardView, PresViewView, PlatformsView, PlatformView, ValidatePendingView # UserRegisterView, UserValidateView
  from portal.util      import TemplateView
  
  # DEPRECATED #named_register_forms = (

diff --cc portal/views.py
Simple merge