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

Conflicts:
	composer.json