Conflicts:
	3rdparty
	lib/db.php
	lib/setup.php
	tests/lib/db.php
	tests/lib/dbschema.php

EventSource and update fixes [master]

- eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser
- eventsource.js: handle undefined data on event
- update.js: in case of error we close the event source - advise the user to reload the page
- update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack

add forwarding emitter for agregating multiple emitters

apply @LukasReschke's cookie changes, hopefully finally fix #854

add MB indicator to size heading, fix #3987

[settings] Use OC instead of oc to show alert at an error.

Use close.png instead of delete.png for closing dialogs

General setup fixes for Oracle

Related to #4001

Thanks @bartv2 and @bantu, merged and closed.

Add path encoding to public API.

Add update permissions hook to sharing

[ie8] Fix lazy CSS loading and missing borders in search dropdown

enable oracle testing by default

Move the upgrade logic to \OC\Updater

Add update permissions hook to sharing

fix insertIfNotExist return value, update doc and corresponding test

Icon cleanup