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

Conflicts:
	portal/homeview.py

diff --cc manifoldapi/static/js/manifold.js
Simple merge

diff --cc myslice/urls.py
Simple merge

diff --cc plugins/scheduler2/templates/scheduler.html
Simple merge

diff --cc portal/actions.py
Simple merge

diff --cc portal/homeview.py
Simple merge

diff --cc portal/slicerequestview.py
Simple merge

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

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