Merge branch 'master' of https://git01.codeplex.com/entityframework

Conflicts:
	src/EntityFramework/Properties/Resources.cs
	src/EntityFramework/Properties/Resources.resx
	test/EntityFramework/FunctionalTests.Transitional/TestHelpers/TestBase.cs