Merge branch 'master' of github.com:SeGonzalezR/qreport
Merge branch 'master' of github.com:SeGonzalezR/qreport
Merge branch 'JuanPabloReport'
Merge pull request #26 from SeGonzalezR/011_dashboard

011 dashboard
Merge branch 'master' of github.com:SeGonzalezR/qreport