Conflicts:
	config/config.sample.php

LDAP: fix and extend tests

Move isadmin to template and rename it to oc_isadmin

fix IE10 viewport sizeing

Allow passing a root folder to get the used space from in the quota wrapper

Improve users list scrolling performance

remove fix for IE9 nav bar width

Correctly redirect to settings page when not selecting cert file for upload

LDAP: prevent other configuration from being deleted when deleting the f...

Remove no longer needed if statement

mount: make location of mount.json configurable

Add missing slash in URLGenerator::getAbsoluteURL().

Fix filetype icons

Jakobud core css logos

Removed '/'. Fixes #7035.

Conflicts:
	core/css/styles.css

Security Update: session fixation

fix master - #7274 brokes it

clean up the sharing ajax calls, add mail notification class

Added extra checks for invalid file chars in newfile.php and newfolder.php

Hardening: Remove dangerous characters + Subdirectory Check

An admin should not be able to add remote and public services on its own

Optimize images