Basic c++ support. vcxproj loading.
Merge remote-tracking branch 'origin/master'