Entity Framework
Merge branch 'origin/master'

Conflicts:
	Source/GroundHandling/GroundHandling.csproj
	Source/GroundHandling/Main.cs