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

diff --combined portal/templates/fed4fire/fed4fire_home-view.html
index 0357018,424677c..1b4549d
--- 1/portal/templates/fed4fire/fed4fire_home-view.html
--- 2/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@@ -84,9 -84,6 +84,9 @@@
                        <h3>
                                A wide variety of world class testbeds available through your one account.
                        </h3>
 +                      <h3>
 +                               <a href='http://doc.fed4fire.eu' target="_blank">Want to learn more?</a>
 +                      </h3>
                </div>
                <div class="col-sm-4 col-sm-offset-1" style="width:400px; top:16px; float:left;">
                        <div class="row">
@@@ -126,7 -123,7 +126,7 @@@ This should go into sessio
  --------*/
  });
  </script>
- <SCRIPT src="http://jfed.iminds.be/dtjava_orig.js"></SCRIPT>
+ <script type="text/javascript" src="{{STATIC_URL}}js/fed4fire_dtjava_orig.js"></script>
  <script>
        function launchApplication(jnlpfile) {
        dtjava.launch(