Merge branch 'master' into moviepreviewfallback

Conflicts:
	lib/private/preview/movies.php
Merge pull request #5867 from owncloud/users-groupadmindropdown

Users groupadmindropdown
Merge pull request #5767 from owncloud/moviepreviewfallback

Added ffmpeg fallback when avconv is not available
Movie preview - use frame after 5 seconds
Merge pull request #5813 from owncloud/fix-4736-master

Don't set a default value when there isn't a default specified
Merge pull request #5700 from owncloud/ldapWizSetDisplayNames

LDAP Wizard: do not forget to set display name attributes for user and g...
Merge pull request #5814 from owncloud/add-indexes

Add some more indexes to tables to improve db queries
increase version number to trigger a DB migration to get more testers for the new indexes.
Use \Patchwork\Utf8\Bootup::initLocale
Merge pull request #5789 from ogasser/db_fix_default_for_numeric

DB: Set correct default value for numeric types
Fix for smb4php fseek

The stream_fseek function must return a boolean which will be mapped
to 0 for success and -1 for failure for the caller.

This patch fixes stream_fseek of smb4php to also respect this
convention.

Since the encryption app is relying on fseek to detect whether a file is
encrypted by reading the last bit of data, this will fix #5023
Update error messages
Merge pull request #5889 from owncloud/extstorage-smb-brokenfseek

Fix for smb4php fseek
readd sharing token to public template
necessary for https://github.com/owncloud/apps/pull/1476
tests added
Merge pull request #5880 from owncloud/replace_etmp_files

write encryption tmp files to the cache folder
Merge pull request #5833 from owncloud/encryption_fixes

[encryption] preserve timestamps and etags during encryption/decryption
Merge pull request #5772 from owncloud/fix5741

LDAP Wizard: introduce configuration status indicator, fixes #5741
Merge pull request #5894 from owncloud/readd_sharing_token

readd sharing token to public template
Fixed error-checking error in sftp.php