Merge remote-tracking branch 'origin/master' into desarrollo
Pesos con miles
Merge remote-tracking branch 'origin/master' into desarrollo
m
Merge branch 'master' of https://github.com/cesaenzv/tecnet
Merge remote-tracking branch 'carlos/desarrollo'
Mayusculas y fancys
mantenimientos
.
Merge pull request #9 from dimortizp/master

Mantenimientos
Fix Especificacion
Change Cliente
Bugs
Merge remote-tracking branch 'origin/desarrollo'

Conflicts:
	protected/runtime/application.log
	protected/views/equipo/admin.php

	new file:   images/icono-trabajo.jpg
	modified:   js/modules/garantiaModule.js
	modified:   js/modules/orderModule.js
	modified:   protected/components/AccessDataRol.php
	modified:   protected/controllers/ClienteController.php
	modified:   protected/controllers/EquipoController.php
	modified:   protected/controllers/EspecificacionController.php
	modified:   protected/controllers/MarcaController.php
	modified:   protected/controllers/OrdenController.php
	modified:   protected/controllers/PaqueteMantenimientoController.php
	modified:   protected/controllers/ProductoController.php
	modified:   protected/controllers/ReportesController.php
	modified:   protected/controllers/ServicioController.php
	modified:   protected/controllers/TipoequipoController.php
	modified:   protected/models/Especificacion.php
	modified:   protected/models/ManageModel.php
	modified:   protected/runtime/application.log
	renamed:    protected/runtime/application.log -> protected/runtime/application.log.1
	renamed:    protected/runtime/application.log.1 -> protected/runtime/application.log.2
	modified:   protected/views/cliente/_formFancy.php
	modified:   protected/views/cliente/admin.php
	modified:   protected/views/cliente/createFancy.php
	modified:   protected/views/equipo/admin.php
	modified:   protected/views/equipo/crearequipo.php
	modified:   protected/views/equipo/creargarantia.php
	modified:   protected/views/especificacion/_form.php
	modified:   protected/views/especificacion/admin.php
	modified:   protected/views/especificacion/view.php
	modified:   protected/views/orden/admin.php
	modified:   protected/views/paquetemantenimiento/_viewAll.php