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

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

lib/public/iservercontainer.php

@@ -62,6 +62,19 @@ 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
 	 *

lib/server.php

@@ -211,6 +211,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	function getConfig() {
 		return $this->query('AllConfig');
 	}
+
 	/**
 	 * Returns an ICache instance
 	 *