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

Conflicts:
	portal/templates/onelab/onelab_home-view.html

diff --cc .settings/org.eclipse.core.resources.prefs
index 2bdc157,2bdc157..f73c991
--- 1/.settings/org.eclipse.core.resources.prefs
--- 2/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@@ -1,5 -1,5 +1,8 @@@
  eclipse.preferences.version=1
  encoding//portal/django_passresetview.py=utf-8
++encoding//portal/forms.py=utf-8
++encoding//portal/migrations/0002_extend_slice.py=utf-8
++encoding//portal/models.py=utf-8
  encoding//portal/urls.py=utf-8
  encoding//portal/validationview.py=utf-8
  encoding//portal/views.py=utf-8

diff --cc plugins/querytable/static/js/querytable.js
Simple merge

diff --cc portal/sliceresourceview.py
Simple merge

diff --cc portal/templates/_widget-topmenu.html
Simple merge

diff --cc portal/templates/home-view.html
Simple merge

diff --cc portal/templates/onelab/onelab_widget-topmenu.html
Simple merge