Alterei a coisa no ts25
Merge branch 'ts25' of https://github.com/kaduazevedo/varejo into ts25

Conflicts:
	index.php