Avance formularios - jp
Merge branch 'JuanPabloReport' of ssh://spider.querys.cl/var/www/report.querys.cl/web into 010_machine

Conflicts:
	app/Model/Machine.php
	app/View/Layouts/default.ctp