modified:   app/controllers/ReportesController.php
	modified:   app/views/empleados/busquedaBalance.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/MapasController.php
	modified:   app/views/home/layout.blade.php
	modified:   app/views/home/welcome.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/marketing_sgc.blade.php