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

diff --cc portal/sliceresourceview.py
index bdffa3f,3ba1084..7d4ab08
--- 1/portal/sliceresourceview.py
--- 2/portal/sliceresourceview.py
+++ b/portal/sliceresourceview.py
@@@ -17,8 -17,9 +17,9 @@@ from plugins.querytable              im
  from plugins.googlemap               import GoogleMap
  from plugins.queryupdater            import QueryUpdater
  from plugins.testbeds                import TestbedsPlugin
+ from plugins.scheduler2              import Scheduler2
  
 -from theme import ThemeView
 +from myslice.theme import ThemeView
  
  class SliceResourceView (LoginRequiredView, ThemeView):
      template_name = "slice-resource-view.html"

diff --cc portal/templates/slice-resource-view.html
Simple merge