Merge branch 'master' of github.com:Voronenko/yii-stub
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Commented unready yet part