working survey report tables
fixed merge conflicts--survey report table up and running