Merge branch 'stable7' of https://github.com/owncloud/core into stable7
Merge branch 'stable7' of https://github.com/quisa137/ownCloud-Core into stable7

Conflicts:
	apps/files_encryption/hooks/hooks.php