new admin setting added which allows to turn off anonymous uploads
in case the encryption app is enabled we cannot yet allow anonymous upload
fixing Undefined index: publicUploadEnabled
change anonymous to public
No admin option to enable public upload in case encryption is enabled
No upload on pubic page if public upload is disabled
Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master
Merge branch 'master' into disable-anon-upload-master
Merge branch 'master' into disable-anon-upload-master

Conflicts:
	settings/templates/admin.php
Merge pull request #4045 from owncloud/disable-anon-upload-master

Disable anon upload master