recreated the edmx and changed model classes to accept new EF enum
Fixed merge conflicts