Conflicts:
	apps/files_encryption/lib/stream.php

This reverts commit 81a45cfc.

Use the namespaced variation of the classname.

also emit hooks for views that are a subfolder of the user folder

Fixed public upload error that prevents upload

Conflicts:
	core/lostpassword/controller.php

Clean up \OC\Util

Add previews to OC.dialogs.filepicker()

use on to add event listener instead of deprecated jquery bind

Texteditor polishing

This reverts commit 64d09452.

center utils

RGB -> HSL

Use provided mimetype on open. Fix #4696

Ocs cleanup

Allow Windows (or Linux) users to specify OpenSSL options in the ownCloud config

This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS.

remove the activity call here. it is not implemented anyways.