To confuso
Merge branch 'master' of https://github.com/CrazyHorsesSoftwares/P2CrazyHorses

Conflicts:
	P2 - CrazyHorses/cad.consulCategoria.aspx.cs
	P2 - CrazyHorses/cad.consultProduto.aspx