alejandro
solMerge branch 'master' of https://github.com/ingjaso/ticketes

Conflicts:
	view/templates/AgregarEvento.tpl
	view/templates_c/269775aeac46eb00745560109e4992ccace306d9.file.AgregarEvento.tpl.php
	view/templates_c/badf57ab1f0774f9a19100e68c9df61ce190ba02.file.AgregarEmpleado.tpl.php
Merge branch 'master' of https://github.com/ingjaso/ticketes