commit
Merge branch 'master' of https://github.com/alexhoanghtd/IRENEOS

Conflicts:
	protected/models/Bill.php
commit TrungNT