added some to .csproj
delete some files, make csproj ok
resolve conflicts
Merge remote-tracking branch 'origin/develop' into develop