Upgraded project and solution files to VS2012