Merge branch 'master' of github.com:yanpeipan/Yii2

# By yanpeipan
# Via yanpeipan
* 'master' of github.com:yanpeipan/Yii2:
  e702c484517c1fe1963c8a64efc42d9192b601ec

Conflicts:
	composer.lock