Merge pull request #106 from Lynart/edmxRedesign

Fixed .edmx
fixed backwards multiplicity between Exercise and Routine
Merge pull request #107 from andeic/edmxMultiplicity

niiiiiiiceeee
fixed the edmx having the wrong property names and updated it to corispond with our database tables
Merge pull request #108 from maronin/database

fixed the edmx having the wrong property names and updated it to corispo...
Merge remote-tracking branch 'origin/master' into edmxRedesignPt2

Conflicts:
	App_Code/Layer2.edmx