make sure that initial encryption also starts for a fresh installation
check if stream wrapper is already registered to avoid warning
fix gitignore for all apps* folders
refactor upload progress
performance improvement, check configuration only if no private key exists
disable avatar loading on public guest page
Merge pull request #4708 from owncloud/encryption_fixes

make sure that initial encryption also starts for a fresh installation
Merge pull request #4889 from owncloud/disable_avatar_loading_on_public_upload_page

disable avatar loading on public guest page
Merge pull request #4872 from owncloud/refactor_upload_progress

refactor upload progress
Merge pull request #4769 from owncloud/gitignore_apps_fix

add slash so inverts are triggered
Merge branch 'master' into fix_3728_with_file_exists_dialog
Merge branch 'master' into fix_3728_with_file_exists_dialog

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