modified:   app/controllers/ReportesController.php
	modified:   app/routes.php
	modified:   app/views/reportes/empleadosFotosBalance.blade.php
	modified:   app/views/reportes/individualBusqueda_bsc.blade.php
	modified:   app/views/reportes/mensual_empleado_bsc.blade.php
	modified:   app/views/reportes/procesosBusqueda_bsc.blade.php
	modified:   app/views/reportes/tablaMensual_bsc.blade.php
	modified:   public/images/example.drawIndicator.png
Merge branch 'master' of https://github.com/santymoreira/sgc

Conflicts:
	app/routes.php

	modified:   app/controllers/FadeController.php
	modified:   app/controllers/HomeController.php
	modified:   app/controllers/MapasController.php
	modified:   app/routes.php
	modified:   app/views/empleados/busquedaBalance.blade.php
	modified:   app/views/fade/fade_sgc.blade.php
	modified:   app/views/fade/macroprocesos.blade.php
	modified:   app/views/home/layout.blade.php