Reverted the previous merge
Merge remote-tracking branch 'upstream/refactor-syntax_unicode' into refactor-syntax_unicode_CStringMac_clean
Note: I get errors on Mac after the merge (about undeclared members of structs), as well as problems on mobile
Conflicts:
	engine/engine-mobile.xcodeproj/project.pbxproj
	engine/src/dskmac.cpp
Merge remote-tracking branch 'origin/refactor-syntax_unicode_CStringMac_clean' into refactor-syntax_unicode_CStringMac_clean

Conflicts:
	engine/src/dskmac.cpp