Updated project files.
Updated solution to include nuget files.
Merge branch 'master' into installer