CP437 support
Merge branch 'master' into swrenderer

Conflicts:
	OpenSpades.xcodeproj/project.pbxproj