ds

sd
wew

wewe
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/routes.php

	modified:   app/controllers/EmpleadosController.php
	modified:   app/controllers/ReportesController.php
	modified:   app/routes.php
	modified:   app/views/empleados/listadoBalance.blade.php
	deleted:    app/views/evaluacion/evaluacion.blade.php
	modified:   app/views/mapasbalanced/AumentarSatis.blade.php
	modified:   app/views/mapasbalanced/FortaCapDoc.blade.php
	modified:   app/views/mapasbalanced/FortaInterApre.blade.php
	modified:   app/views/mapasbalanced/ImpleSgc.blade.php
	modified:   app/views/mapasbalanced/ImplenGestionProc.blade.php
	modified:   app/views/mapasbalanced/MejorarClimaLab.blade.php
	modified:   app/views/mapasbalanced/OptimiRecu.blade.php
	modified:   app/views/mapasbalanced/PotenInnov.blade.php
modified:   app/views/mapasbalanced/PotenInves.blade.php
	modified:   app/views/mapasbalanced/PotenVincSociedad.blade.php
modified:   app/views/mapasbalanced/cont_audi_bsc.blade.php
	modified:   app/views/mapasbalanced/empresas_bsc.blade.php
	modified:   app/views/mapasbalanced/fade_bsc.blade.php
	modified:   app/views/mapasbalanced/finanzas_bsc.blade.php
	modified:   app/views/mapasbalanced/marketing_bsc.blade.php
	modified:   app/views/mapasbalanced/transporte_bsc.blade.php
	new file:   app/views/reportes/empleadosFotosBalance.blade.php
	new file:   app/views/reportes/individualBusqueda_bsc.blade.php
	modified:   app/views/reportes/individual_bsc.blade.php
	new file:   app/views/reportes/mensual_empleado_bsc.blade.php
	new file:   app/views/reportes/procesosBusqueda_bsc.blade.php
	new file:   app/views/reportes/procesos_bsc.blade.php
	new file:   app/views/reportes/tablaMensual_bsc.blade.php
	new file:   app/views/reportes/tabla_bsc.blade.php
	modified:   public/1.PNG
	new file:   public/carpetasArchivos/06039735792014-10-012014-10-12.pdf
	modified:   public/images/1.PNG
	modified:   public/images/Exterior/exterior.png
	modified:   public/images/example.drawIndicator.png
	modified:   public/images/fadebsc/AcredCarr.png
	modified:   public/images/fadebsc/AumentarSatis.png
	modified:   public/images/fadebsc/FortaCapDoc.png
	modified:   public/images/fadebsc/FortaInterApre.png
	modified:   public/images/fadebsc/ImpleGProces.png
	modified:   public/images/fadebsc/ImpleSgc.png
	modified:   public/images/fadebsc/MejorarClimaLab.png
	modified:   public/images/fadebsc/OptimiRecu.png
	modified:   public/images/fadebsc/PotenInnov.png
	modified:   public/images/fadebsc/PotenVincSociedad.png
	modified:   public/images/fadebsc/Poten_Inves.png
	modified:   public/images/fadebsc/contenedor.png
	modified:   public/images/fadebsc/fade.png