Update composer.json
Update composer.json
Update composer.json
some changes
composer update
Merge branch 'master' of github.com:SerafimArts/Asset

Conflicts:
	composer.json
Merge branch '2.0.0' of github.com:SerafimArts/Asset