Conflicts:
	tests/lib/files/storage/storage.php

Cleanup some template functions

Switch to using Google Drive SDK, closes #2047

Better error handling

Fixing share JS error

Remove root option from Google Drive storage, because it is only used for testing and we have our own empty Google account for testing

Parallel autotest.sh master

* owncloud/fix_oc_image_reference:
  need to use \OC_Image to escape OCP namespace

return result from getL10N

OC_Connector_Sabre_Principal::searchPrincipals - return empty array instead of 0

Ext fs irods master

Disable anon upload master

Conflicts:
	settings/templates/admin.php

Use !== and === in settings.

reworking of \OC\Files\Storage\AmazonS3

if the file doesn't exists; create a new one. We use this to create new text files in the web interface

This way the error won't be fatal in a unit test

Remove scanner logic from ajax file and place it in it's own class

Generate better errors in base.php

Add classes replaced by the public api to the code checker