Entity Framework added via NuGet
Merge branch 'master' of https://github.com/aphel/TeamCityTestProject

Conflicts:
	TeamCityTestProject.v11.suo