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
Merge branch 'master' of https://github.com/santymoreira/sgc

Conflicts:
	public/images/example.drawIndicator.png

	modified:   app/controllers/FadeController.php
	modified:   app/views/home/layout.blade.php
	modified:   app/views/mapas/M_Docencia.blade.php
	modified:   app/views/mapas/empresas_sgc.blade.php
	modified:   app/views/mapas/exterior_sgc.blade.php
	modified:   app/views/mapas/finanzas_sgc.blade.php
	modified:   app/views/mapas/marketing_sgc.blade.php
	modified:   app/views/mapas/transporte_sgc.blade.php
	modified:   public/css/StylesDocencia.css
	modified:   public/css/estilo.css
	modified:   public/images/example.drawIndicator.png
Merge branch 'master' of https://github.com/santymoreira/sgc

Conflicts:
	public/images/example.drawIndicator.png

	modified:   app/models/Login.php
	modified:   app/views/home/welcome.blade.php
	modified:   app/views/mapas/M_Academica.blade.php
	modified:   app/views/mapas/M_Administrativa.blade.php
	modified:   app/views/mapas/M_Asistencia.blade.php
	modified:   app/views/mapas/M_Docencia.blade.php
	modified:   app/views/mapas/M_Investigacion.blade.php
	modified:   app/views/mapas/M_Vinculacion.blade.php
	modified:   app/views/mapas/cont_audi_sgc.blade.php
	modified:   app/views/mapas/empresas_sgc.blade.php
	modified:   app/views/mapas/exterior_sgc.blade.php
	modified:   app/views/mapas/finanzas_sgc.blade.php
	modified:   app/views/mapas/macroprocesos.blade.php
	modified:   app/views/mapas/marketing_sgc.blade.php
	modified:   app/views/mapas/transporte_sgc.blade.php
	modified:   app/views/mapasbalanced/AcredCarr.blade.php
	modified:   app/views/mapasbalanced/AumentarSatis.blade.php
	modified:   app/views/mapasbalanced/FortaCapDoc.blade.php
Merge branch 'master' of https://github.com/santymoreira/sgc

H
	modified:   app/controllers/ReportesController.php
	modified:   app/models/Login.php
	modified:   app/routes.php
	modified:   app/views/mapasbalanced/PotenInnov.blade.php
	new file:   app/views/reportes/empleadosFotosBalance.blade.php
	new file:   app/views/reportes/individualBusqueda_bsc.blade.php
	new file:   app/views/reportes/mensual_empleado_bsc.blade.php
	new file:   app/views/reportes/procesosBusqueda_bsc.blade.php
	modified:   app/views/reportes/procesos_bsc.blade.php

	new file:   app/views/reportes/tablaMensual_bsc.blade.php
	modified:   app/views/reportes/tabla_bsc.blade.php
	modified:   public/1.PNG
	modified:   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
Merge branch 'master' of https://github.com/santymoreira/sgc

Conflicts:
	app/routes.php

	modified:   app/filters.php
	modified:   app/routes.php
	modified:   public/.htaccess