Added more Chinese and Japanese characters for the conversation. Also fixed the Japanese script for the conversation screen. Also changed a bit of the demo Japanese script.
Merge remote-tracking branch 'origin/master'