OK
Merge branch 'master' of https://github.com/timmy78/yii2basic

Conflicts:
	README.md