zxzx

asas
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/images/example.drawIndicator.png

	modified:   app/controllers/MapasBalancedController.php
	modified:   app/controllers/ReportesController.php
	modified:   app/views/empleados/busquedaBalance.blade.php
	modified:   app/views/mapasbalanced/marketing_bsc.blade.php
	modified:   app/views/reportes/empleadosFotosBalance.blade.php
	modified:   app/views/users/createfade.blade.php
	modified:   app/views/users/editfade.blade.php
	modified:   public.zip
	modified:   public/images/70.PNG
	new file:   public/public1.zip
	new file:   public/public2.zip
	modified:   sgc.zip