Consolidate Rendering Mode
Merge remote-tracking branch 'upstream/master'

Conflicts:
	UI/GameSettingsScreen.cpp
	UI/MenuScreens.cpp
	Windows/ppsspp.rc
Remove _ suffix and hide the GPU mode on GLES2
Warning fixes, improve error msg
Merge branch 'raven02-master'

Conflicts:
	native