Merge branch 'master' into packaging

Conflicts:
	runtime.properties

diff --cc runtime.properties
index 35516dd,d656cac..9379e42
--- 1/runtime.properties
--- 2/runtime.properties
+++ b/runtime.properties
@@@ -1,3 -1,9 +1,9 @@@
- loginUrl = {{ settings.LOGIN_URL }}
- authCookie = {{ settings.AUTH_COOKIE_NAME }}
- feedbackUrl = {{ settings.FEEDBACK_URL }}
+ #!!!!!ATTENTION!!!!! loginUrl MUST end at "next=". You should not give the value of the next parameter. It will be determined automatically 
 -loginUrl=/im/login?next=
 -CLOUDBAR_ACTIVE_SERVICE = pithos
 -CLOUDBAR_LOCATION = /static/im/cloudbar/
 -CLOUDBAR_SERVICES = /im/get_services
 -CLOUDBAR_MENU = /im/get_menu
 -authCookie=_pithos2_a
 -feedbackUrl=/feedback
++loginUrl={{ settings.LOGIN_URL }}
++CLOUDBAR_ACTIVE_SERVICE = {{ settings.CLOUDBAR_ACTIVE }}
++CLOUDBAR_LOCATION = {{ settings.CLOUDBAR_LOCATION }}
++CLOUDBAR_SERVICES = {{ settings.CLOUDBAR_SERVICES_URL }}
++CLOUDBAR_MENU = {{ settings.CLOUDBAR_MENU_URL }}
++authCookie={{ settings.AUTH_COOKIE_NAME }}
++feedbackUrl={{ settings.FEEDBACK_URL }}
+ version=0.9.0

diff --cc src/gr/grnet/pithos/web/public/index.html
index 2a43d56,c8d4f22..8a9dd6b
--- 1/src/gr/grnet/pithos/web/public/index.html
--- 2/src/gr/grnet/pithos/web/public/index.html
+++ b/src/gr/grnet/pithos/web/public/index.html
@@@ -53,15 -53,23 +53,16 @@@
                <script type="text/javascript" src="browserplus-min.js"></script>
                <!-- Load plupload and all it's runtimes and finally the jQuery queue widget -->
                <script type="text/javascript" src="plupload/js/plupload.full.js"></script>
 -              <script type="text/javascript" src="plupload/js/jquery.plupload.queue/jquery.plupload.queue.js"></script>
 -              <script>
 -                  var CLOUDBAR_ACTIVE_SERVICE = 'pithos';
 -                  var CLOUDBAR_LOCATION = "/static/im/cloudbar/";
 -                  var CLOUDBAR_SERVICES = "/im/get_services";
 -            var CLOUDBAR_MENU = "/im/get_menu";
 -            
 -                  $(document).ready(function(){
 -                    $.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');
 -                  })
 -              </script>
 -              <script>
 +        <script type="text/javascript" src="plupload/js/jquery.plupload.queue/jquery.plupload.queue.js"></script>
 +
 +        {{ CLOUDBAR_CODE }}
 +        
 +        <script>
                        var otherProperties = {
                                loginUrl: "/im/login?next=",
-                               feedbackUrl: "/im/feedback",
-                               authCookie: "_pithos2_a"
+                               feedbackUrl: "/feedback",
+                               authCookie: "_pithos2_a",
+                               version: ""
                        }
                </script>
      </head>