Entity Framework update
Merge branch 'master' of https://github.com/jm3565/DragonTrax.git