sdas
Merge branch 'master' of https://github.com/Lindar90/yii.test

Conflicts:
	.idea/workspace.xml