* owncloud/master: (98 commits)
  [tx-robot] updated from transifex
  files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
  setting a default on filecache column unencrypted_size
  [tx-robot] updated from transifex
  remove unneccessary lib in namespace
  namespaces use upcasefirst parts when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic!
  initialize variable
  calculate correct permissions while toggle the password protection
  make sure that both $permissions and $oldPermissions have the same type
  Add copyright, remove starting blank line
  update inherit docs comment
  Fix insert/update/delete helper functions for oracle
  Add missing return true statements to legacy preferences functions
  Add missing static
  Convert OC_Preference to object interface
  fix race condition in lazy preview loading
  use {count} instead of 'One' for more versatile translation
  fix double translation of error message
  use n to translate title
  fixing typos and l10n
  ...

Conflicts:
	tests/lib/files/cache/scanner.php

sharing, allow user to disable password protection

remove deleted files while scanning

Convert OC_Preference to object interface

Fixing 4416 master

When filtering search results, ensure results are children of the...

files: when filtering search results, ensure results are children of the fakeroot not just path starting the same

namespaces use upcasefirst parts

when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy

when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!

Use more object oriented way for console commands

css selectors never have a : before []

file upload conflicts dialog

Conflicts:
	apps/files/js/filelist.js

File permissions are part of the ajax response of file upload

initial scrollto implementation

Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog

Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog

Conflicts:
	apps/files/js/file-upload.js