cv

cv
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/images/example.drawIndicator.png

	modified:   app/views/reportes/individual.blade.php
	modified:   app/views/reportes/mensual_empleado.blade.php