Fix solution file.
Merge remote-tracking branch 'origin/master' into LibG_two_versions
Fix the addin paths.