modified:   protected/controllers/NewInvoiceController.php
	modified:   protected/models/Address.php
	modified:   protected/models/Partners.php
	modified:   protected/models/Users.php
Merge branch 'master' of https://github.com/AlexInternship/ehfportalNew

Conflicts:
	protected/controllers/NewInvoiceController.php

	modified:   css/newuser.css
	modified:   protected/controllers/NewInvoiceController.php
	modified:   protected/views/newInvoice/viewinvoice.php