Entity Framework 6 checkin

Entity Framework 6 checkin
Merge remote-tracking branch 'origin/master'

Conflicts:
	SiteDisksNET.Test/Properties/AssemblyInfo.cs
	SiteDisksNET.Test/SiteDisksNET.Test.csproj
	SiteDisksNET.Test/app.config
Recreate the conflict files?

Recreate the conflict files?
Merge remote-tracking branch 'origin/master'