Changed project to .NET 4.0
Merge conflict handled