Update edmx en scripts
Merge branch 'master' of https://github.com/Nactive/Scouting

Conflicts:
	src/Scouting.Database/ScoutingContext.cs