second fase
Merge branch 'master' of https://github.com/leroyakg/yiitest
bkanfsa