Merge branch 'master' into memcard_directory Conflicts: Source/Core/Core/Core.vcxproj.filters Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp Source/Core/Core/Src/HW/GCMemcard.cpp Source/Core/Core/Src/HW/GCMemcard.h
