modified:   protected/components/CallDB.php
	modified:   protected/controllers/NewInvoiceController.php
	modified:   protected/controllers/SiteController.php
	modified:   protected/models/LoginForm.php
	modified:   protected/views/layouts/main.php
	modified:   protected/views/newInvoice/newuser.php
	modified:   protected/views/site/viewinvoice.php
Merge branch 'master' of https://github.com/AlexInternship/ehfportalNew

Conflicts:
	protected/controllers/SiteController.php
	protected/views/site/viewinvoice.php

	modified:   protected/controllers/SiteController.php
	modified:   protected/views/site/testView.php
	modified:   protected/views/site/viewinvoice.php