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

Conflicts:
	protected/controllers/SiteController.php

	modified:   protected/controllers/SiteController.php