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

Conflicts:
	portal/joinview.py
	portal/registrationview.py

diff --cc myslice/settings.py
index 5c75970,10b3953..f9f439e
--- 1/myslice/settings.py
--- 2/myslice/settings.py
+++ b/myslice/settings.py
@@@ -45,9 -49,13 +49,13 @@@ except
  # when deployed from a package
  # this code is run by collectstatic too, so we cannot
  # assume we have ./static present already
 -HTTPROOT="/var/myslice-f4f"
 +HTTPROOT="/var/www/myslice/"
  # the place to store local data, like e.g. the sqlite db
  DATAROOT="/var/unfold"
+ if not os.path.isdir(DATAROOT):
+     print("WARNING: {} is a non-existing directory".format(DATAROOT))
+     print("consequently we assume development mode and re-route DATAROOT to {}".format(ROOT))
+     DATAROOT=ROOT
  # if not there, then we assume it's from a devel tree
  if not os.path.isdir (os.path.join(HTTPROOT,"static")):
      HTTPROOT=ROOT

diff --cc portal/registrationview.py
Simple merge

diff --cc portal/slicetabexperiment.py
Simple merge