Fix test cases for group manager
Merge pull request #6748 from owncloud/fileinfo

Add a FileInfo class which holds all info of a file ...
LDAP: prevent other configuration from being deleted when deleting the first one which has an empty prefix for historical reasons
fileinfo is no longer a array
Merge pull request #7206 from owncloud/fix_enc_tests

fileinfo is no longer a array
remove the JsonSerializable interface from \OC\Files\FileInfo
Merge pull request #7204 from owncloud/groupexists-duplicate

Remove duplicate call to groupExists
Fit shared videos to viewer, just like images. Issue #1648
Merge pull request #7207 from owncloud/fileinfo-serializable

Remove the JsonSerializable interface from \OC\Files\FileInfo
Merge branch 'master' into scrutinizer_documentation_patches

Conflicts:
	lib/private/appconfig.php
Merge pull request #7156 from owncloud/backgroundjob-public

Add the background job list to the public server container
catch errors during initial encryption
catch errors during decryption
don't block login forever if we are stuck in the middle of the initial encryption
Merge pull request #7155 from owncloud/enc_improved_error_handling

[encryption] improved error handling
Finish basic testing of user export
Merge branch 'master' into migration_unit_tests
Removed quota question
Merge pull request #6892 from owncloud/issuetemplate-enhancements

Issue template enhancements
Merge pull request #7132 from owncloud/issue/6920

Do not select input for all text input fields