Build Fix and sync 2013 & 2012 sln files
Merge pull request #3235 from Conceptual-Design/master

Build Fix and sync 2013 & 2012 sln files