modified:   public/images/example.drawIndicator.png
Merge branch 'master' of https://github.com/santymoreira/sgc

Conflicts:
	public/images/example.drawIndicator.png

	modified:   app/views/fade/MF_Academica.blade.php
	modified:   app/views/fade/MF_Academico.blade.php
	modified:   app/views/fade/MF_Administrativa.blade.php
	modified:   app/views/fade/MF_Calidad.blade.php
	modified:   app/views/fade/MF_Docencia.blade.php
	modified:   app/views/fade/MF_Financiero.blade.php
	modified:   app/views/fade/MF_Informatico.blade.php
	modified:   app/views/fade/MF_Investigacion.blade.php
	modified:   app/views/fade/MF_Transporte.blade.php
	modified:   app/views/fade/MF_Vinculacion.blade.php
	modified:   app/views/fade/fade_sgc.blade.php
	modified:   app/views/fade/macroprocesos.blade.php
	modified:   app/views/home/layout.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_Mantenimiento.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
	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/Perspectivas.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
	modified:   app/views/reportes/individual.blade.php
	modified:   app/views/reportes/individual_bsc.blade.php
	modified:   app/views/reportes/mensual_empleado.blade.php
	modified:   app/views/reportes/mensual_empleado_bsc.blade.php
	modified:   app/views/users/checkFiles.blade.php
	modified:   app/views/users/create.blade.php
	modified:   app/views/users/edit.blade.php
	modified:   app/views/users/empleados.blade.php
	modified:   app/views/users/show.blade.php
	modified:   app/views/users/upload.blade.php
	new file:   public/images/objetivosO/prueba.png