Merge remote-tracking branch 'origin/master'

Conflicts:

	negosys/src/main/java/ec/com/redepronik/utils/service/ReporteServiceImpl.java