remove old yii reference
Merge branch 'master' into deploy