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

Conflicts:
	rest/__init__.py

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

diff --cc portal/templates/onelab/onelab_home-view.html
index b81d960,b81d960..2855aee
--- 1/portal/templates/onelab/onelab_home-view.html
--- 2/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@@ -100,7 -100,7 +100,7 @@@
                });
                
                {% if person %}
--              $.getJSON("/rest/user/", function( data ) {
++        $.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
                  var items = [];
                  $.each( data[0].slice, function( key, val ) {
                        items.push( "<li><a href=\"portal/slice/"+val.slice_hrn+"\">" + val.slice_hrn + "</a></li>" );

diff --cc rest/__init__.py
Simple merge