Merge pull request #6 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
Merge pull request #27 from davidpoveda89/master

Agregar Recinto y combo anidado
Merge pull request #9 from ingjaso/master

lugares poveda