Controladores
Merge branch 'master' of https://github.com/AnibalRA/farmacia

Conflicts:
	app/controllers/ProductoController.php