Merge pull request #8 from ingjaso/master

crud completo por pagina web de empleado guia!!!
controladores de proveedor, consuimidor, cliente
Merge branch 'master' of https://github.com/davidpoveda89/ticketes

Conflicts:
	view/templates_c/8efe79ccaf0dc007780404c7d7a5b383e03493c8.file.agregar_empleado.tpl.php
	view/templates_c/ab703c88e1535d3e38a4d70242f716dd78323c34.file.ComboEliminarRecinto.tpl.php
Merge pull request #32 from davidpoveda89/master

centroComercial,Proveedor, consumidor(ventanas de agregar y eliminar)