Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/runtime/application.log
	protected/views/site/search.php
Merge branch 'master' of https://github.com/ForceTower/This_is_feira_click

Conflicts:
	protected/runtime/application.log
	protected/views/site/search.php