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

Conflicts:
	portal/templates/institution.html

diff --cc portal/templates/institution.html
index e4003b4,a0f6510..812b2e5
--- 1/portal/templates/institution.html
--- 2/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@@ -166,6 -123,6 +166,7 @@@
                  slice_row += "<td>"+slice_url+"</td>";
                  slice_row += "<td>"+nodes_length+"</td>";
                  slice_row += "<td>"+val.slice_expires+"</td>";
++                slice_row += "</tr>";
                  table_slices.push(slice_row);
                  
              });
@@@ -191,6 -150,6 +192,7 @@@
                  user_row += "<td>"+val.user_first_name+"</td>";
                  user_row += "<td>"+val.user_last_name+"</td>";
                                user_row += "<td>"+val.enabled+"</td>";
++                user_row += "</tr>";
                  table_users.push(user_row);
                  
              });