Merged my yii-user version with github
Merged versions
Merged versions