varios reportes
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/services/com/luxsoft/sw4/rh/IncentivoService.groovy
confilc
Revert "varios reportes"

This reverts commit f30fd7b0cc3cceea13b0a32542af8d610b1b3e0a.
Revert "confilc"

This reverts commit 6b90b42de5ba883eb936151c420eed23c275166c.
Merge remote-tracking branch 'origin/master'