Merge pull request #18 from deepak-srivastava/reports

CRM-12623
Merge branch 'master' into reports
CRM-12623