un cambio
Merge branch 'master' of https://github.com/LabPLC/infomercado

Conflicts:
	app/controllers/HomeController.php
Merge branch 'master' of https://github.com/LabPLC/infomercado
bugs en listas de mercado resueltas