Upgrade the sln to VS 2012
Merge pull request #4629 from ScottNZ/sln-upgrade

Upgrade the sln to VS 2012