Re-add Visual Studio template files (reverts fe907e5ac7)
Merge pull request #955 from kwhatmough/master

Re-add Visual Studio template files
Merge pull request #956 from blackberry/master

Merge master into next