finishing touch
Merge branch 'master' of https://github.com/leroyakg/yiitest