psr-4
psr-4
Merge branch 'master' of https://github.com/sheillendra/yii2-advanced

Conflicts:
	composer.json
	composer.lock
psr-4