Fix code to search for mount.json in custom data folders
Merge pull request #7332 from owncloud/IE10-viewport

fix IE10 viewport sizeing
remove additional transition rule, reduce width of collapsed search bar
fix viewport size on windows phone
Fix path to the mount file
Merge pull request #7291 from owncloud/adminess-raghu

Move isadmin to template and rename it to oc_isadmin
add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935
Fixed issue with drag and drop not in the root directory, for folders and files
Hide remove image, if there's no custom avatar

Fix #7308
Allow apps to add/modify config js output via hook.
Merge pull request #7312 from owncloud/ldap_fix_add_test

LDAP: fix and extend tests
Move session_regenerate_id to `login()`
Remove `session_id_regenerate` from here

Jenkins somewhat complains that there are already sent headers.
code style: else on same line
Merge branch 'master' into no-css-js-delivery-via-php

Conflicts:
	config/config.sample.php
Remove unit tests which causes the filesystem tests to fail
updating 3rdparty
ignore optional additional config files
Merge pull request #7348 from owncloud/remove-problematic-test

Remove unit tests which causes the filesystem tests to fail
Merge branch 'master' into patch-headers-already-sent