Update composer.json
Update composer.json
Merge branch 'master' of git://github.com/InteLigent/yii2-uikit-x

Conflicts:
	composer.json