ReportControl fix; restored edmx file (no changes)