Fixed csproj
Started to fix build problems resulting from merge
added missing file