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

Conflicts:
	protected/controllers/SiteController.php

	modified:   js/addrow.js
	modified:   protected/components/CallDB.php
	modified:   protected/controllers/SiteController.php
	deleted:    protected/models/Invoices.php
	deleted:    protected/models/Ourinvoicelines.php
	deleted:    protected/models/Ourinvoices.php
	deleted:    protected/models/Partner.php
	modified:   protected/models/SerializeDocuments.php
	deleted:    protected/models/User.php
	deleted:    protected/models/retailers.php
	modified:   protected/views/site/newuser.php