Merge branch 'master' of ssh://spider.querys.cl/var/www/report.querys.cl/web into JuanPabloReport
vendida
Merge branch 'master' of ssh://spider.querys.cl/var/www/report.querys.cl/web into JuanPabloReport

Conflicts:
	app/Controller/FormsController.php
se agrega libreria para pdf, y cambios a form
Merge branch 'master' of ssh://spider.querys.cl/var/www/report.querys.cl/web into JuanPabloReport
Merge branch 'JuanPabloReport'
Merge branch 'master' of ssh://spider.querys.cl/var/www/report.querys.cl/web into 012_buildings
Log lib font doompdf
Merge branch 'master' of ssh://spider.querys.cl/var/www/report.querys.cl/web into 012_buildings

Conflicts:
	app/Vendor/dompdf/lib/fonts/log.htm
Generacion de PDF
Merge branch 'JuanPabloReport'
OT
ocisaidsa
Merge branch 'fepezoabarca'

Conflicts:
	app/Model/Machine.php
	app/View/Layouts/default.ctp
	app/View/WorkOrders/add.ctp
Cambios Locales
Ajustes
Merge branch 'master' of ssh://spider.querys.cl/var/www/report.querys.cl/web into 012_buildings

Conflicts:
	app/Model/CostCenter.php
	app/View/Layouts/default.ctp
Merge pull request #30 from SeGonzalezR/012_buildings

Mezcla de cambios JP y Felipe