sync
Merge branch 'master' of https://github.com/OscarBastardo/freymca

Conflicts:
	app/Model/DetalleOrden.php
	app/Model/Orden.php
	app/View/Inspeccions/add.ctp
	app/View/Ordens/add.ctp
	app/View/Ordens/add_sitio.ctp
	app/View/Ordens/cabecera_inspeccion.ctp
sync