Fix some JSLint warnings
Fix a syntax error & have if-conds in an own line
Merge branch 'master' into fix_jslint_kondou

Conflicts:
	apps/files/js/file-upload.js
Merge pull request #4262 from owncloud/fix_jslint_kondou

Fix some JSLint warnings
Do not use realpath() on includes.

If the file does not exist, realpath() returns false and "include false;"
produces "Failed opening '' for inclusion" which is a useless error message.

'include' works just fine with symlinks, "./" and "../".
Also remove other unnecessary realpath() calls.
Use __DIR__ instead of dirname(__FILE__).

This is possible because we require PHP 5.3 or higher.
[tx-robot] updated from transifex
LDAP: fix wrong hook name
Sharing: only determine path root if owner is available
additional readdir check in mappedlocal
Merge branch 'master' of github.com:owncloud/core
Merge pull request #4537 from owncloud/no-realpath

Do not use realpath() on includes.
[tx-robot] updated from transifex
Merge branch 'master' into ===_and_!==_in_lib

Conflicts:
	lib/public/share.php