Merge branch 'master' into rename-lostpassword-controller

apps/files/css/files.css

apps/files/js/filelist.js

apps/files/l10n/fr.php

apps/files/l10n/pt_BR.php

apps/files/templates/index.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/l10n/fr.php

apps/files_encryption/l10n/hu_HU.php

apps/files_encryption/lib/crypt.php

apps/files_encryption/lib/helper.php

apps/files_sharing/l10n/fr.php

apps/files_trashbin/l10n/fr.php

apps/files_trashbin/templates/index.php

apps/files_versions/l10n/fr.php

apps/user_webdavauth/l10n/fr.php

config/config.sample.php

core/css/apps.css

core/css/fixes.css

core/css/styles.css

core/js/js.js