Merge branch 'master' into oc_avatars

apps/files/l10n/fr.php

apps/files/l10n/pt_BR.php

apps/files/templates/index.php

apps/files_encryption/l10n/fr.php

apps/files_encryption/l10n/hu_HU.php

apps/files_sharing/l10n/fr.php

apps/files_trashbin/l10n/fr.php

apps/files_versions/l10n/fr.php

apps/user_webdavauth/l10n/fr.php

core/css/apps.css

core/js/js.js

core/js/oc-dialogs.js

core/js/oc-requesttoken.js

core/js/placeholder.js

core/l10n/fr.php

core/l10n/hi.php

core/lostpassword/controller.php

core/minimizer.php

core/setup.php

l10n/fr/core.po