Conflicts:
	apps/user_ldap/user_ldap.php

add ldap-search command to occ

Conflicts:
	apps/user_ldap/appinfo/register_command.php

LDAP search filter creation changes:

1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar"  when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.

trim search string before passing it on

Merge headers

make \OC\Files\Node\Node implement the FileInfo interface

PHP 5.4 is now required for master

Remove last traces of travis integration

Otherwise the headers from `JSONResponse` are gone and the Content-Type of the response would be `text/html` instead of `application/json; charset=utf-8`. This leads to broken scripts since we set the `nosniff` tag, furthermore this is very bad from a security PoV.

Remove workaround for 5.3

App dependencies php version

[encryption] remove check for PHP version

Bower jstz

some more unit tests on xml info parser

Function is natively available with 5.4

🍻

fix typo in license header

Replace uniqid calls with $this->getUniqueID so tests pass again on windows

drop files_external tests from autotest - they will be executed with aut...

Update autotest.cmd

Officially deprecate passwordsalt

drop files_external tests from autotest - they will be executed with autotest-external.sh which is coming

[encryption] reorganize folder structure (second try to make Jenkins happy)