Merge branch 'appframework-master' into public_cache

Conflicts:
	lib/public/iservercontainer.php
	lib/server.php

diff --cc lib/public/iservercontainer.php
index 1087c24edc0d55a3ca69d43b1d22c835cec300f1,ec7212b306e2777666aec24178847e2b751a5f6b..1725b7c74e04bdd8d6c68495e6bae8312d57b191
--- 1/lib/public/iservercontainer.php
--- 2/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@@ -62,11 -62,11 +62,18 @@@ interface IServerContainer 
         */
        function getRootFolder();
  
 +      /**
 +       * Returns an ICache instance
 +       *
 +       * @return \OCP\ICache
 +       */
 +      function getCache();
 +
+       /**
+        * Returns the current session
+        *
+        * @return \OCP\ISession
+        */
+       function getSession();
+ 
  }

diff --cc lib/server.php
index f02b2bed8dee552cca79fd43bf1126cc131c2430,0eee3e0f73a808ca061aef7150dd4cb622ebe4b5..f4dc22a2be49da1f52078214bc8867aebcb7c959
--- 1/lib/server.php
--- 2/lib/server.php
+++ b/lib/server.php
@@@ -98,13 -97,13 +97,22 @@@ class Server extends SimpleContainer im
                return $this->query('RootFolder');
        }
  
 +      /**
 +       * Returns an ICache instance
 +       *
 +       * @return \OCP\ICache
 +       */
 +      function getCache() {
 +              return $this->query('UserCache');
 +      }
 +
+       /**
+        * Returns the current session
+        *
+        * @return \OCP\ISession
+        */
+       function getSession() {
+               return \OC::$session;
+       }
+ 
  }