Обновление настроек composer
Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/skyeng/yii into feature/homework

Conflicts:
	composer.json
	libs/composer.phar