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

Conflicts:
	portal/templates/onelab/onelab_slice-resource-view.html

diff --cc portal/templates/onelab/onelab_slice-resource-view.html
index 4051c62,8206fdf..80c3fcc
--- 1/portal/templates/onelab/onelab_slice-resource-view.html
--- 2/portal/templates/onelab/onelab_slice-resource-view.html
+++ b/portal/templates/onelab/onelab_slice-resource-view.html
@@@ -46,9 -46,9 +46,9 @@@
                        {% endif %}
                </div>
                <div class="row">
 -                      <ul class="nav nav-tabs nav-resources">
 +                      <ul class="nav nav-pills nav-resources">
                          <li class="active"><a data-panel="resources" href="#">Resources</a></li>
-                         <li><a data-panel="map" href="#">Map</a></li>
+                         <li id="GoogleMap"><a data-panel="map" href="#">Map</a></li>
                          <li><a data-panel="pending" href="#">Pending</a></li>
                          <li><a href="#"></a></li>
                        </ul>