fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case
Merge pull request #7566 from owncloud/button-outlines

Adds 0 Outlines to Buttons
Merge pull request #7568 from owncloud/lib_preview_add_fclose

add fclose, fixes issue from bdb96b9af85256f9b3f8663ccf6d27b3d1330918
Merge pull request #7569 from owncloud/scrutinizer-tabs

fix some spaces to tabs issues reported by Scrutinizer
Merge pull request #7531 from owncloud/dont_create_shared_folder

don't allow to create a file or folder named 'Shared' in the root folder
Do not set #dir when on public.php

Fix #7571
Merge pull request #7354 from pschmitt/master

Use 'command -v' to detect whether and where software is installed (instead of 'which')
Merge pull request #7575 from owncloud/issue/7571

Do not set #dir when on public.php
Merge branch 'master' into fix-7307

Conflicts:
	core/js/router.js
	settings/js/admin.js
adding new javascript function OC.generateUrl(url, params)
adding js unit tests for OC.generateUrl()
Show warning page when accessing server from an untrusted domain

Added early check for the requested domain host and show a warning
page if the domain is not trusted.
Added localhost as trusted domain
Added unit tests for serverHost and other related functions
Fixed X-Forwarded-Host parsing
fix merge conflicts
only check ldap_errno if an ldap_* function actually fails
fix wizard errors
reset search paging right after the search, not before some of the possible next search operations
cookie contains binary characters, don't log it
  (avoids json_encode(): Invalid UTF-8 sequence in argument errors)
"reset" ldap pagedSearch control by setting it to a high value
call nextEntry via invokeLDAPMethod
"reset" ldap pagedSearch control by setting it to a high value
fix noise not repeating