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

Conflicts:
	Core/Config.cpp
	Core/Config.h
	Core/Core.vcxproj.filters
	Core/HLE/sceKernel.cpp

Windows/WndMainWindow.cpp

@@ -188,6 +188,9 @@ namespace MainWindow
 	void setFpsLimit(int fps) {
 		g_Config.iFpsLimit = fps;
 	}
+	void enableCheats(int cheats){
+		g_Config.iEnableCheats = cheats;
+	}
 
 	BOOL Show(HINSTANCE hInstance, int nCmdShow)
 	{