realizado los dias de trabajo en ticket bogota y arreglos para el error faltal
Merge branch 'master' of https://github.com/jamper91/tiquetes

Conflicts:
	app/Config/database.php
	app/Controller/EntradasController.php
	app/Controller/PeopleController.php
	app/Vendor/fpdf/ean13.php
	app/Vendor/fpdf/ean13_1.php
	app/Vendor/fpdf/fpdf_js.php
	app/View/Entradas/exportar5.ctp
	app/View/People/add.ctp
	app/View/People/pdf.ctp

corrections