Merge branch 'master' into appframework-master

lib/files/node/file.php

lib/files/node/folder.php

lib/files/node/node.php

lib/files/node/nonexistingfile.php

lib/files/node/nonexistingfolder.php

lib/files/node/root.php

lib/files/storage/storage.php

lib/files/view.php

lib/public/files/alreadyexistsexception.php

lib/public/files/file.php

lib/public/files/folder.php

lib/public/files/node.php

lib/public/files/notenoughspaceexception.php

lib/public/files/notfoundexception.php

lib/public/files/notpermittedexception.php

lib/public/files/storage.php

tests/lib/files/node/file.php

tests/lib/files/node/folder.php

tests/lib/files/node/integration.php

tests/lib/files/node/node.php