yii add
Merge branch 'master' of https://github.com/ferrius/docs
yii add