modified:   protected/components/CallDB.php
	modified:   protected/components/SendMail.php
	modified:   protected/components/inviteTemplate.html
	modified:   protected/config/main.php
Merge branch 'master' of https://github.com/AlexInternship/ehfportalNew
Merge branch 'master' of https://github.com/AlexInternship/ehfportalNew
Merge branch 'master' of https://github.com/AlexInternship/ehfportalNew
	new file:   protected/controllers/InvoiceListController.php
	new file:   protected/controllers/NewInvoiceController.php
	modified:   protected/controllers/SiteController.php
	new file:   protected/views/invoiceListController/invoiceList.php
	new file:   protected/views/newInvoiceController/newuser.php