Merge remote-tracking branch 'shuffle2/vc12' Conflicts: Source/Core/Common/Common.vcxproj Source/Core/Common/Common.vcxproj.filters
