change1234
Merge remote-tracking branch 'origin/master'

Conflicts:
	SearchGoogle.py
	cloudstorage/__init__.py
	cloudstorage/api_utils.py
	cloudstorage/cloudstorage_api.py
	cloudstorage/common.py
	cloudstorage/errors.py
	cloudstorage/rest_api.py
	cloudstorage/storage_api.py
	cloudstorage/test_utils.py