Merge pull request #4 from ingjaso/master

config
Merge pull request #4 from ingjaso/master

crud de zona
Merge pull request #5 from ingjaso/master

Actualizacion
Merge pull request #14 from AkaAnto/master

pull request
alters
Merge pull request #20 from davidpoveda89/master

Merge pull request #4 from ingjaso/master
Merge pull request #21 from AkaAnto/master

Smarty mas ejemplo de controlador y template base
Merge pull request #19 from penajose10/master

alters
Merge pull request #6 from ingjaso/master

alters y controladora
Merge pull request #5 from ingjaso/master

alters y controladora
Merge branch 'master' of https://github.com/ingjaso/ticketes
Merge pull request #24 from penajose10/master

Merge pull request #6 from ingjaso/master
Merge pull request #7 from ingjaso/master

alter
Merge branch 'master' of https://github.com/ingjaso/ticketes
eliminacion de zona
Merge pull request #25 from davidpoveda89/master

agregar Recinto y combos anidados
Merge pull request #6 from ingjaso/master

empleado
Merge pull request #8 from ingjaso/master

empleado
Agregar Recinto y combos anidados
Merge branch 'master' of https://github.com/davidpoveda89/ticketes

Conflicts:
	index.php
	model/Zona.php
	view/templates/index.tpl
	view/templates_c/101f1626e22514a16d5eb11e83511bb2ec2d8c0e.file.index.tpl.php