composer deleted
composer deleted
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/application/bootstrap.php
	www/composer.json
	www/composer.lock
	www/vendor/composer/autoload_classmap.php
	www/vendor/composer/autoload_namespaces.php
	www/vendor/composer/autoload_real.php
	www/vendor/composer/installed.json
	www/vendor/composer/installers/README.md
	www/vendor/composer/installers/composer.json
	www/vendor/composer/installers/src/Composer/Installers/Installer.php
	www/vendor/composer/installers/src/Composer/Installers/ZendInstaller.php
	www/vendor/composer/installers/tests/Composer/Installers/Test/InstallerTest.php
composer deleted