Add getUserFolder/getAppFolder to Server.
Update to adhere to the coding guidelines.
Don't try to be clever
Merge branch 'appframework-master' into server_folder_methods
Fix syntax error
Add getUserFolder/getAppFolder to Server.
Don't try to be clever
Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods

Conflicts:
	lib/public/iservercontainer.php
	lib/server.php
Remove duplicate method definitions
Merge pull request #4898 from owncloud/server_folder_methods

Server folder methods