Merge branch 'Filtros' of https://github.com/thiagovsk/To_de_Olho into Filtros

Conflicts:
	Gemfile.lock