S'afegeix Marcas
Problemes merge
Merge branch 'master' of github.com:MarMartinez/mercasmart

Conflicts:
	mercasmartPersistence/mercasmartPersistence.csproj