modified:   protected/components/CallDB.php
	modified:   protected/components/ConvertArray.php
	modified:   protected/components/RandomPassword.php
	modified:   protected/components/SendMail.php
	modified:   protected/components/Stub.php
	modified:   protected/components/ValidateArray.php
	modified:   protected/controllers/SiteController.php
Merge branch 'master' of https://github.com/AlexInternship/ehfportalNew

Conflicts:
	protected/controllers/SiteController.php