Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_m...

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

diff --cc lib/public/iservercontainer.php
index dcf8c162e6fcb9542678b38a600df4b5caea68da,cbb9fdf6c2f05a9f4080ce127ce6194cdf811331..d3ee5d15dccc3758207538099bceb015230fb79c
--- 1/lib/public/iservercontainer.php
--- 2/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@@ -62,22 -62,19 +62,35 @@@ interface IServerContainer 
         */
        function getRootFolder();
  
+       /**
+        * Returns a view to ownCloud's files folder
+        *
+        * @return \OCP\Files\Folder
+        */
+       function getUserFolder();
+ 
+       /**
+        * Returns an app-specific view in ownClouds data directory
+        *
+        * @return \OCP\Files\Folder
+        */
+       function getAppFolder();
 +      /**
 +       * Returns the user session
 +       *
 +       * @return \OCP\IUserSession
 +       */
 +      function getUserSession();
 +
 +      /**
 +       * @return \OCP\INavigationManager
 +       */
 +      function getNavigationManager();
 +
 +      /**
 +       * @return \OCP\IConfig
 +       */
 +      function getConfig();
  
        /**
         * Returns an ICache instance

diff --cc lib/server.php
index dcfd0a2db99998786526a172aa177da5ac6435b6,4f5bcfbe676260bcf0bf74c5a7ee2f4b424eeb02..fccb8fad4d00b2d5fe6f31ae9cb29a32edc31a3b
--- 1/lib/server.php
--- 2/lib/server.php
+++ b/lib/server.php
@@@ -184,33 -133,6 +184,34 @@@ class Server extends SimpleContainer im
                return $folder;
        }
  
 +      /**
 +       * @return \OC\User\Manager
 +       */
 +      function getUserManager() {
 +              return $this->query('UserManager');
 +      }
 +
 +      /**
 +       * @return \OC\User\Session
 +       */
 +      function getUserSession() {
 +              return $this->query('UserSession');
 +      }
 +
 +      /**
 +       * @return \OC\NavigationManager
 +       */
 +      function getNavigationManager() {
 +              return $this->query('NavigationManager');
 +      }
 +
 +      /**
 +       * @return \OC\Config
 +       */
 +      function getConfig() {
 +              return $this->query('AllConfig');
 +      }
++
        /**
         * Returns an ICache instance
         *