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

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

fixing syntax error - it it that hard to test own code?

Split personal and user-mgmt password change logic

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