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

Conflicts:
	protected/components/Serializer.php

	modified:   js/addrow.js
	modified:   protected/components/Serializer.php
	modified:   protected/controllers/SiteController.php
	deleted:    protected/models/AxForm.php
	deleted:    protected/models/Invoicelines.php
	modified:   protected/models/User.php
	deleted:    protected/views/site/axForm.php
	modified:   protected/views/site/newuser.php