sdsd
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/routes.php
	public/images/example.drawIndicator.png

	modified:   app/controllers/ReportesController.php
	modified:   app/routes.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/empleadosFotosBalance.blade.php
	modified:   app/views/reportes/individualBusqueda_bsc.blade.php
	modified:   app/views/reportes/individual_bsc.blade.php
	modified:   app/views/reportes/mensual_empleado_bsc.blade.php
	modified:   app/views/reportes/procesosBusqueda.blade.php
	modified:   app/views/reportes/procesosBusqueda_bsc.blade.php
	modified:   app/views/reportes/procesos_bsc.blade.php
	modified:   app/views/reportes/tablaMensual_bsc.blade.php
	modified:   public/1.PNG
	new file:   public/95.PNG
	modified:   public/carpetasArchivos/06018170672014-10-152014-10-29.pdf
	modified:   public/carpetasArchivos/06031896552014-10-012014-10-31.pdf
	modified:   public/images/1.PNG
	new file:   public/images/95.PNG
	modified:   public/images/Utilitarios/naranja.png
	modified:   public/images/Utilitarios/rojo.png
	modified:   public/images/Utilitarios/verde.png