updates
Merge branch 'master' of https://github.com/dagobailon/progress_crm_reporting
fixed files