[Version Control] Bug 13886 - Conflicted project files.

Initial code for adding possibility to resolve conflicts for projects.
We need to support MergeView on .csproj and .sln.
[Version Control] Merge View fixes:

No longer throw exception because we modify children list on destroy.
We now have an attachable window for project files which are in a broken project.