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

diff --combined portal/templates/fed4fire/fed4fire_widget-topmenu.html
index be047e0,1902cd8..178075d
--- 1/portal/templates/fed4fire/fed4fire_widget-topmenu.html
--- 2/portal/templates/fed4fire/fed4fire_widget-topmenu.html
+++ b/portal/templates/fed4fire/fed4fire_widget-topmenu.html
@@@ -7,9 -7,9 +7,9 @@@
                
                <div id="secondary">
                        <ul>
 -                              <li>News</li>
                                <li><a href="/portal/about">About</a></li>
 -                              <li><a target="_blank" href="http://www.fed4fire.eu">Project Website</a></li>
 +                              <li><a href="http://doc.fed4fire.eu/">Documentation</a></li>
 +                              <li><a target="_blank" href="http://www.fed4fire.eu">Project website</a></li>
                        </ul>
                </div>
        </div>
@@@ -40,6 -40,7 +40,7 @@@
                                </div>
                                </li>
                        <li id="nav-request"><a href="/portal/validate">REQUESTS</a></li>
+                       <li id="nav-request"><a href="/portal/servicedirectory">SERVICES</a></li>
                        <li id="nav-support"><a href="http://doc.fed4fire.eu/support.html" target="_blank">SUPPORT</a></li>
                        <li>|</li>
                        <li id="nav-logout" style="margin-top: 10px;"><a id="logout" style="cursor:pointer;" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> LOGOUT</a></li>