Atualizações de Interface
Merge branch 'master' of https://github.com/ForceTower/This_is_feira_click

Conflicts:
	protected/views/site/index.php