modified:   css/newuser.css
	modified:   protected/controllers/NewInvoiceController.php
	modified:   protected/views/newInvoice/viewcreatedinvoice.php
	modified:   protected/views/newInvoice/viewinvoice.php
Merge branch 'master' of https://github.com/AlexInternship/ehfportalNew

Conflicts:
	protected/controllers/NewInvoiceController.php

	modified:   protected/components/CallDB.php
	modified:   protected/components/UserIdentity.php
	modified:   protected/controllers/NewInvoiceController.php
	modified:   protected/models/Partners.php
	renamed:    protected/models/SerializeDocument.php -> protected/models/documnt.php