asda
Merge branch 'master' of https://github.com/AlexInternship/testingRelation

Conflicts:
	protected/controllers/LogController.php