bug fix marker
Merge branch 'development' of https://github.com/vanbungkring/turbo-lana into development

Conflicts:
	protected/controllers/front/SiteController.php
	protected/views/front/site/result.php