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:   public/images/example.drawIndicator.png
	modified:   app/controllers/ReportesController.php
	modified:   app/routes.php
	modified:   app/views/empleados/evaluacionBalance.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:   public/images/example.drawIndicator.png
Merge branch 'master' of https://github.com/santymoreira/sgc

Conflicts:
	public/images/example.drawIndicator.png

	modified:   app/controllers/EmpleadosController.php
	modified:   app/controllers/MapasController.php
	modified:   app/views/empleados/evaluacionBalance.blade.php
modified:   app/views/empleados/textoBusquedaBalance.blade.php
	modified:   app/views/mapas/cont_audi_sgc.blade.php
	modified:   app/views/mapas/empresas_sgc.blade.php
	modified:   public/95.PNG
	modified:   public/images/95.PNG