Fixed .edmx
Minor fixes
Removed Neil's stuff to compile, fixed 1 to many error between Exercise
and Routines
Merge pull request #106 from Lynart/edmxRedesign

Fixed .edmx