composer
Merge branch 'master' of https://github.com/sjarvela/cloudberry

Conflicts:
	vendor/autoload.php
	vendor/composer/autoload_real.php