connexio a entity per variables dentorn
Merge branch 'master' of github.com:MarMartinez/mercasmart

Conflicts:
	mercasmartTest/App.Config
	mercasmartTest/mercasmartTest.csproj