modified:   protected/components/UserIdentity.php
	modified:   protected/controllers/NewInvoiceController.php
	modified:   protected/controllers/SiteController.php
Merge branch 'master' of https://github.com/AlexInternship/ehfportalNew