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

use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there

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

add slash so inverts are triggered

refactor upload progress

disable avatar loading on public guest page

make sure that initial encryption also starts for a fresh installation

Conflicts:
	apps/files/css/files.css
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files_sharing/js/public.js
	core/js/jquery.ocdialog.js
	core/js/oc-dialogs.js

add exists method to jquery

Fix Sharing "Expiration Date" on Oracle

refactor upload js & html to always use only js to fill form data

Add OCP\DB::getErrorMessage() to public namespace.

adding null check on a mount's storage

use lineheight instead of padding and height

Fixes #4465 - Added autoFocus to #shareWith autocomplete options

Use external and shared icons in OC.Dialogs.filepicker()

OC Avatars