Merge branch 'makotech222-cwcheat' of https://github.com/hrydgard/ppsspp into cwcheat

Conflicts:
	Core/CwCheat.cpp
	Core/CwCheat.h
	Core/HLE/__sceAudio.cpp
	Core/HLE/sceKernel.cpp