Updated reports form
resolving merge conflicts in reports controller with patbranch after adding reports queries
fixed merge conflicts with patbranch