teste
Merge branch 'master' of https://github.com/PauloHerrera/ondecomprar

Conflicts:
	OndeComprar.MVC/OndeComprar.MVC.csproj
commit merge web config changed