Edmx Changes

Added Agent to TimeSheetMaster
Merge branch 'develop' of https://github.com/victordc/ATS into develop