Merge branch 'master' into hook-improvements

Conflicts:
	lib/files/view.php
Move comment and set requesttoken.
[tx-robot] updated from transifex
only show personal settings if the recovery feature is enabled or if no private key is set
tell the user what he can do to regain access to his files
allow to press enter to update the password
print a warning if a user wants to reset his password and encryption is enabled
add a hint that the admin can recover your files; Don't let the user change the recovery settings if no private key is set
trashbin -> deleted files
[tx-robot] updated from transifex
add hint about what the recovery password field is for
always emit the preSetPassword hook, this should only indicate the intention. Finally the post-hooks indicate if it was successful or not
use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened
- implement touch() to at least create a file which doesn't exist
- implement a work around for folder mtimes - irods doesn't provide updated mtimes
update to latest master
seperate mimetype guessing from filename
Read configuratons for external filesystem test from a private place.

This will help not to accidentially push private data and enable testing on our ci server.
fix variable name
actually return result
Merge pull request #3622 from owncloud/read-extfx-confg-from-home

Read configuratons for external filesystem test from a private place.