issue 1255
Merge branch 'master' of git://github.com/studio107/Mindy_Yii