abc
fix user model
Merge branch 'master' of https://github.com/alexhoanghtd/IRENEOS

Conflicts:
	protected/models/User.php